projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.12-rc2' into patchwork
[firefly-linux-kernel-4.4.55.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 456d6386edf8b5f34e80f3b25de4605e18269ad2..9f9c0441a9175d970184977340988415f1dbb354 100644
(file)
--- a/
arch/arm/mach-ks8695/board-acs5k.c
+++ b/
arch/arm/mach-ks8695/board-acs5k.c
@@
-20,7
+20,7
@@
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
#include <linux/i2c-gpio.h>
-#include <linux/
i2c
/pca953x.h>
+#include <linux/
platform_data
/pca953x.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>