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 commit 'v2.6.36-rc1' into kbuild/rc-fixes
[pandora-kernel.git]
/
arch
/
arm
/
mach-s5pv210
/
setup-i2c1.c
diff --git
a/arch/arm/mach-s5pv210/setup-i2c1.c
b/arch/arm/mach-s5pv210/setup-i2c1.c
index
45e0e6e
..
148bb78
100644
(file)
--- a/
arch/arm/mach-s5pv210/setup-i2c1.c
+++ b/
arch/arm/mach-s5pv210/setup-i2c1.c
@@
-14,10
+14,10
@@
#include <linux/kernel.h>
#include <linux/types.h>
+#include <linux/gpio.h>
struct platform_device; /* don't need the contents */
-#include <mach/gpio.h>
#include <plat/iic.h>
#include <plat/gpio-cfg.h>