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 '3.2-without-smb2' of git://git.samba.org/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-nomadik
/
i2c-8815nhk.c
diff --git
a/arch/arm/mach-nomadik/i2c-8815nhk.c
b/arch/arm/mach-nomadik/i2c-8815nhk.c
index
abfe25a
..
0fc2f6f
100644
(file)
--- a/
arch/arm/mach-nomadik/i2c-8815nhk.c
+++ b/
arch/arm/mach-nomadik/i2c-8815nhk.c
@@
-3,8
+3,8
@@
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
#include <linux/i2c-gpio.h>
-#include <linux/gpio.h>
#include <linux/platform_device.h>
+#include <plat/gpio-nomadik.h>
/*
* There are two busses in the 8815NHK.