git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[safe/jmp/linux-2.6]
/
drivers
/
input
/
keyboard
/
matrix_keypad.c
diff --git
a/drivers/input/keyboard/matrix_keypad.c
b/drivers/input/keyboard/matrix_keypad.c
index
f9d86cf
..
b443e08
100644
(file)
--- a/
drivers/input/keyboard/matrix_keypad.c
+++ b/
drivers/input/keyboard/matrix_keypad.c
@@
-22,6
+22,7
@@
#include <linux/module.h>
#include <linux/gpio.h>
#include <linux/input/matrix_keypad.h>
+#include <linux/slab.h>
struct matrix_keypad {
const struct matrix_keypad_platform_data *pdata;