git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.34' into for-2.6.35
[pandora-kernel.git]
/
sound
/
soc
/
s3c24xx
/
s3c64xx-i2s.c
diff --git
a/sound/soc/s3c24xx/s3c64xx-i2s.c
b/sound/soc/s3c24xx/s3c64xx-i2s.c
index
6552894
..
ab1fa15
100644
(file)
--- 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>