diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-01-16 16:40:35 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-01-16 16:40:35 +0000 |
| commit | 2905a5df4a1600bc3c9ecace2fa65404196d1fda (patch) | |
| tree | f788a65eabb0686943f7166bc924441f14c11da4 /sound/soc | |
| parent | 0465c7aa6fbab89de820442aed449ceb8d9145a6 (diff) | |
| parent | 591046cfc5f1b452db0a4557850ad7f394e38231 (diff) | |
Merge branch 'for-2.6.29' into for-2.6.30
Diffstat (limited to 'sound/soc')
| -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 1fac5efd285..3dcdc4e3cfa 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" |