Merge branch 'for-2.6.29' into for-2.6.30

2905a5df · Mark Brown · 0465c7aa · 591046cf · 2905a5df
隐藏空白更改
内联并排

Showing with 0 addition and 2 deletion

sound/soc/atmel/atmel-pcm.c sound/soc/atmel/atmel-pcm.c +0 -2

未找到文件。
--- a/sound/soc/atmel/atmel-pcm.c
+++ b/sound/soc/atmel/atmel-pcm.c
@@ -44,8 +44,6 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>

-#include <mach/hardware.h>
-
 #include "atmel-pcm.h"