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 'acpi-pad' into release
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap2
/
board-omap3pandora.c
diff --git
a/arch/arm/mach-omap2/board-omap3pandora.c
b/arch/arm/mach-omap2/board-omap3pandora.c
index 6f6c601eeab7c1ecbdd12dc88c77ec853248f372..ef17cf1ab6d7cc37b132a30d3b443ea4e93f9bf0 100644
(file)
--- a/
arch/arm/mach-omap2/board-omap3pandora.c
+++ b/
arch/arm/mach-omap2/board-omap3pandora.c
@@
-24,7
+24,7
@@
#include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>
#include <linux/regulator/machine.h>
-#include <linux/i2c/twl
4030
.h>
+#include <linux/i2c/twl.h>
#include <linux/leds.h>
#include <linux/input.h>
#include <linux/input/matrix_keypad.h>