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 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-ks8695
/
board-acs5k.c
diff --git
a/arch/arm/mach-ks8695/board-acs5k.c
b/arch/arm/mach-ks8695/board-acs5k.c
index 937eb1d47e7bb793a774e06c015347e726abc513..ef835d82cdb95ecb7f43d36a80f1dc7c9870a5b6 100644
(file)
--- a/
arch/arm/mach-ks8695/board-acs5k.c
+++ b/
arch/arm/mach-ks8695/board-acs5k.c
@@
-19,7
+19,7
@@
#include <linux/gpio/machine.h>
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
-#include <linux/i2c-gpio.h>
+#include <linux/
platform_data/
i2c-gpio.h>
#include <linux/platform_data/pca953x.h>
#include <linux/mtd/mtd.h>