Merge branch 'topic/asoc' into for-linus

db45705c · Takashi Iwai · 1de9e8e7 · 591046cf · db45705c
隐藏空白更改
内联并排

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"