projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[linux-2.6-block.git]
/
arch
/
arm
/
mach-pxa
/
raumfeld.c
diff --git
a/arch/arm/mach-pxa/raumfeld.c
b/arch/arm/mach-pxa/raumfeld.c
index feddca7f3540e4b41e9075425dd2cfe5f0e335f3..4d5d05cf87d69b513b337632ed6c3127a5ead6cf 100644
(file)
--- a/
arch/arm/mach-pxa/raumfeld.c
+++ b/
arch/arm/mach-pxa/raumfeld.c
@@
-32,7
+32,7
@@
#include <linux/pwm.h>
#include <linux/pwm_backlight.h>
#include <linux/i2c.h>
-#include <linux/
i2c/pxa-i2c
.h>
+#include <linux/
platform_data/i2c-pxa
.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
#include <linux/lis3lv02d.h>