projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'linux-kselftest-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
arch
/
arm
/
mach-pxa
/
viper.c
diff --git
a/arch/arm/mach-pxa/viper.c
b/arch/arm/mach-pxa/viper.c
index
4185e7f
..
90d0f27
100644
(file)
--- a/
arch/arm/mach-pxa/viper.c
+++ b/
arch/arm/mach-pxa/viper.c
@@
-37,7
+37,7
@@
#include <linux/jiffies.h>
#include <linux/i2c-gpio.h>
#include <linux/gpio/machine.h>
-#include <linux/
i2c/pxa-i2c
.h>
+#include <linux/
platform_data/i2c-pxa
.h>
#include <linux/serial_8250.h>
#include <linux/smc91x.h>
#include <linux/pwm.h>