git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s5pv210
/
setup-i2c0.c
diff --git
a/arch/arm/mach-s5pv210/setup-i2c0.c
b/arch/arm/mach-s5pv210/setup-i2c0.c
index 0f1cc3a1c1e8abf620b76a157e4f9bdbb048a17f..4a15849766c0e0d2d5458634690d5e6e178652a2 100644
(file)
--- a/
arch/arm/mach-s5pv210/setup-i2c0.c
+++ b/
arch/arm/mach-s5pv210/setup-i2c0.c
@@
-18,7
+18,7
@@
struct platform_device; /* don't need the contents */
-#include <
plat/iic
.h>
+#include <
linux/platform_data/i2c-s3c2410
.h>
#include <plat/gpio-cfg.h>
void s3c_i2c0_cfg_gpio(struct platform_device *dev)