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 tag 'devprop-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-pxa
/
stargate2.c
diff --git
a/arch/arm/mach-pxa/stargate2.c
b/arch/arm/mach-pxa/stargate2.c
index 7b6610e9dae46cc9e981b819f5326a909bf53e68..2d45d18b1a5e0a1b954fe3f691b933bb03488c08 100644
(file)
--- a/
arch/arm/mach-pxa/stargate2.c
+++ b/
arch/arm/mach-pxa/stargate2.c
@@
-26,7
+26,7
@@
#include <linux/mtd/partitions.h>
#include <linux/i2c/pxa-i2c.h>
-#include <linux/
i2c
/pcf857x.h>
+#include <linux/
platform_data
/pcf857x.h>
#include <linux/platform_data/at24.h>
#include <linux/smc91x.h>
#include <linux/gpio.h>