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 'pstore-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-pxa
/
mxm8x10.c
diff --git
a/arch/arm/mach-pxa/mxm8x10.c
b/arch/arm/mach-pxa/mxm8x10.c
index 9a22ae0ad8c9e0f5823714003583bb70a2ef7e62..f9e3d41a4609a19aa9052af8db5ef0bd2d68b9f9 100644
(file)
--- a/
arch/arm/mach-pxa/mxm8x10.c
+++ b/
arch/arm/mach-pxa/mxm8x10.c
@@
-22,7
+22,7
@@
#include <linux/serial_8250.h>
#include <linux/dm9000.h>
#include <linux/gpio.h>
-#include <linux/
i2c/pxa-i2c
.h>
+#include <linux/
platform_data/i2c-pxa
.h>
#include <linux/platform_data/mtd-nand-pxa3xx.h>