diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-17 06:10:13 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-17 06:10:13 -0500 |
| commit | db45705c7fc473fd2ffb2c9621df4a4a4f33f1ad (patch) | |
| tree | 28a33c619c486c2799af2d0336aec4299334edce /sound | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
| parent | 591046cfc5f1b452db0a4557850ad7f394e38231 (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/atmel/atmel-pcm.c | 2 |
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 @@ | |||
| 44 | #include <sound/pcm_params.h> | 44 | #include <sound/pcm_params.h> |
| 45 | #include <sound/soc.h> | 45 | #include <sound/soc.h> |
| 46 | 46 | ||
| 47 | #include <mach/hardware.h> | ||
| 48 | |||
| 49 | #include "atmel-pcm.h" | 47 | #include "atmel-pcm.h" |
| 50 | 48 | ||
| 51 | 49 | ||