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 branch 'for-linus-bugs' of git://git.kernel.org/pub/scm/linux/kernel/git/sage...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-pxa
/
em-x270.c
diff --git
a/arch/arm/mach-pxa/em-x270.c
b/arch/arm/mach-pxa/em-x270.c
index 3a3362fa793edd06e2dab0f4d88d08c8a1af4d0f..8eb4e23c561d2569c1ede0e00dac6ecc402815c4 100644
(file)
--- a/
arch/arm/mach-pxa/em-x270.c
+++ b/
arch/arm/mach-pxa/em-x270.c
@@
-30,7
+30,7
@@
#include <linux/power_supply.h>
#include <linux/apm-emulation.h>
#include <linux/i2c.h>
-#include <linux/
i2c
/pca953x.h>
+#include <linux/
platform_data
/pca953x.h>
#include <linux/i2c/pxa-i2c.h>
#include <linux/regulator/userspace-consumer.h>