diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 18:23:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 18:23:46 +0100 |
| commit | 74511020dde10252f8b8e648690d99dba721de14 (patch) | |
| tree | 04fc22bc7dd5d5b8d9294b2e57985b093858bd84 /sound/soc/s3c24xx | |
| parent | ASoC: Allow WM8903 mic detect disable and don't force bias on (diff) | |
| parent | ASoC: Remove BROKEN from i.MX audio after dependencies merged (diff) | |
| download | linux-74511020dde10252f8b8e648690d99dba721de14.tar.xz linux-74511020dde10252f8b8e648690d99dba721de14.zip | |
Merge branch 'for-2.6.34' into for-2.6.35
Diffstat (limited to 'sound/soc/s3c24xx')
| -rw-r--r-- | sound/soc/s3c24xx/s3c64xx-i2s.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c index 65528943579b..ab1fa159d3ae 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s.c +++ b/sound/soc/s3c24xx/s3c64xx-i2s.c @@ -19,8 +19,8 @@ #include <sound/soc.h> #include <plat/regs-s3c2412-iis.h> -#include <plat/gpio-bank-d.h> -#include <plat/gpio-bank-e.h> +#include <mach/gpio-bank-d.h> +#include <mach/gpio-bank-e.h> #include <plat/gpio-cfg.h> #include <mach/map.h> |