Merge branch 'for-2.6.29' into for-2.6.30
This commit is contained in:
commit
2905a5df4a
1 changed files with 0 additions and 2 deletions
|
@ -44,8 +44,6 @@
|
|||
#include <sound/pcm_params.h>
|
||||
#include <sound/soc.h>
|
||||
|
||||
#include <mach/hardware.h>
|
||||
|
||||
#include "atmel-pcm.h"
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue