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 branch 'x86-spinlocks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
input
/
keyboard
/
omap-keypad.c
diff --git
a/drivers/input/keyboard/omap-keypad.c
b/drivers/input/keyboard/omap-keypad.c
index
33d0bdc
..
323bcdf
100644
(file)
--- a/
drivers/input/keyboard/omap-keypad.c
+++ b/
drivers/input/keyboard/omap-keypad.c
@@
-35,7
+35,7
@@
#include <linux/mutex.h>
#include <linux/errno.h>
#include <linux/slab.h>
-#include <
mach
/gpio.h>
+#include <
asm
/gpio.h>
#include <plat/keypad.h>
#include <plat/menelaus.h>
#include <asm/irq.h>