forked from luck/tmp_suning_uos_patched
Merge branch 'for-2.6.29' into for-2.6.30
This commit is contained in:
commit
2905a5df4a
@ -44,8 +44,6 @@
|
||||
#include <sound/pcm_params.h>
|
||||
#include <sound/soc.h>
|
||||
|
||||
#include <mach/hardware.h>
|
||||
|
||||
#include "atmel-pcm.h"
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user