summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-01-17 12:10:13 +0100
committerTakashi Iwai <tiwai@suse.de>2009-01-17 12:10:13 +0100
commitdb45705c7fc473fd2ffb2c9621df4a4a4f33f1ad (patch)
tree28a33c619c486c2799af2d0336aec4299334edce /sound
parent1de9e8e70f5acc441550ca75433563d91b269bbe (diff)
parent591046cfc5f1b452db0a4557850ad7f394e38231 (diff)
downloadlinux-db45705c7fc473fd2ffb2c9621df4a4a4f33f1ad.tar.bz2
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/atmel/atmel-pcm.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/atmel/atmel-pcm.c b/sound/soc/atmel/atmel-pcm.c
index 1fac5efd285b..3dcdc4e3cfa0 100644
--- 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"