git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[pandora-kernel.git]
/
drivers
/
input
/
keyboard
/
w90p910_keypad.c
diff --git
a/drivers/input/keyboard/w90p910_keypad.c
b/drivers/input/keyboard/w90p910_keypad.c
index
085ede4
..
e0f6cd1
100644
(file)
--- a/
drivers/input/keyboard/w90p910_keypad.c
+++ b/
drivers/input/keyboard/w90p910_keypad.c
@@
-21,7
+21,7
@@
#include <linux/io.h>
#include <linux/slab.h>
-#include <
mach/w90p910_keypad
.h>
+#include <
linux/platform_data/keypad-w90p910
.h>
/* Keypad Interface Control Registers */
#define KPI_CONF 0x00