Merge branch 'for-2.6.29' into for-2.6.30

git-mirror · Jan 16, 2009 · 2905a5d · 2905a5d
2 parents 0465c7a + 591046c
commit 2905a5d
Showing 1 changed file with 0 additions and 2 deletions.
diff --git 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"