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 branch 'drm-next-4.16' of git://people.freedesktop.org/~agd5f/linux into drm...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-pxa
/
pcm990-baseboard.c
diff --git
a/arch/arm/mach-pxa/pcm990-baseboard.c
b/arch/arm/mach-pxa/pcm990-baseboard.c
index 0bd5959ef7d55bddc64d18c998dbdac11f7d4303..973568d4b9ec2d70788083750862df16e2a9e230 100644
(file)
--- a/
arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/
arch/arm/mach-pxa/pcm990-baseboard.c
@@
-23,7
+23,7
@@
#include <linux/irq.h>
#include <linux/platform_device.h>
#include <linux/i2c.h>
-#include <linux/
i2c/pxa-i2c
.h>
+#include <linux/
platform_data/i2c-pxa
.h>
#include <linux/pwm.h>
#include <linux/pwm_backlight.h>