summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-03-08 16:08:46 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-03-08 16:08:46 +0000
commit004c1c7096659d352b83047a7593e91d8a30e3c5 (patch)
tree2801e22e945d2ca6016383348e16583918164526 /sound
parent882d01f96bc1909455696aae6eb7ce4df3e908c8 (diff)
parent3b05007e43ea629394e89ea0b023d7b15375a2bb (diff)
downloadlinux-3.10-004c1c7096659d352b83047a7593e91d8a30e3c5.tar.gz
linux-3.10-004c1c7096659d352b83047a7593e91d8a30e3c5.tar.bz2
linux-3.10-004c1c7096659d352b83047a7593e91d8a30e3c5.zip
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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c
index cc7edb5f792..22fdb799c88 100644
--- a/sound/soc/s3c24xx/s3c64xx-i2s.c
+++ b/sound/soc/s3c24xx/s3c64xx-i2s.c
@@ -28,8 +28,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>