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 'davinci-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
drivers
/
input
/
keyboard
/
sh_keysc.c
diff --git
a/drivers/input/keyboard/sh_keysc.c
b/drivers/input/keyboard/sh_keysc.c
index 854e2035cd6e66108fb14f57ee7038991d5106fc..d7dafd9425b69b0682035822185900b8e8ac3d72 100644
(file)
--- a/
drivers/input/keyboard/sh_keysc.c
+++ b/
drivers/input/keyboard/sh_keysc.c
@@
-22,6
+22,7
@@
#include <linux/bitmap.h>
#include <linux/clk.h>
#include <linux/io.h>
+#include <linux/slab.h>
static const struct {
unsigned char kymd, keyout, keyin;