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 'microblaze-4.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-pxa
/
hx4700.c
diff --git
a/arch/arm/mach-pxa/hx4700.c
b/arch/arm/mach-pxa/hx4700.c
index 66184f5cbe402c47d26ff5370b6b22967231c6d9..e2e7f247a6456746f6fb3773c4798c512d3b27e4 100644
(file)
--- a/
arch/arm/mach-pxa/hx4700.c
+++ b/
arch/arm/mach-pxa/hx4700.c
@@
-38,7
+38,7
@@
#include <linux/spi/spi.h>
#include <linux/spi/pxa2xx_spi.h>
#include <linux/usb/gpio_vbus.h>
-#include <linux/
i2c/pxa-i2c
.h>
+#include <linux/
platform_data/i2c-pxa
.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>