diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 11:08:46 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 11:08:46 -0500 |
| commit | 004c1c7096659d352b83047a7593e91d8a30e3c5 (patch) | |
| tree | 2801e22e945d2ca6016383348e16583918164526 /sound | |
| parent | 882d01f96bc1909455696aae6eb7ce4df3e908c8 (diff) | |
| parent | 3b05007e43ea629394e89ea0b023d7b15375a2bb (diff) | |
Merge branch 'for-rmk/samsung6' of git://git.fluff.org/bjdooks/linux into devel-stable
Diffstat (limited to 'sound')
| -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 cc7edb5f792d..22fdb799c883 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s.c +++ b/sound/soc/s3c24xx/s3c64xx-i2s.c | |||
| @@ -28,8 +28,8 @@ | |||
| 28 | #include <sound/soc.h> | 28 | #include <sound/soc.h> |
| 29 | 29 | ||
| 30 | #include <plat/regs-s3c2412-iis.h> | 30 | #include <plat/regs-s3c2412-iis.h> |
| 31 | #include <plat/gpio-bank-d.h> | 31 | #include <mach/gpio-bank-d.h> |
| 32 | #include <plat/gpio-bank-e.h> | 32 | #include <mach/gpio-bank-e.h> |
| 33 | #include <plat/gpio-cfg.h> | 33 | #include <plat/gpio-cfg.h> |
| 34 | 34 | ||
| 35 | #include <mach/map.h> | 35 | #include <mach/map.h> |