diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-04-16 15:20:06 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-04-16 15:20:06 +0200 |
commit | cf0dbba515415bb19b11f9323d5f7bebd7f24fd6 (patch) | |
tree | 375bbc1ade1a92acd6493d224dd701fd7f209014 /drivers/input/keyboard/davinci_keyscan.c | |
parent | ALSA: i2c: Fixed 8 checkpatch errors (diff) | |
parent | ALSA: Release v1.0.23 (diff) | |
download | linux-cf0dbba515415bb19b11f9323d5f7bebd7f24fd6.tar.xz linux-cf0dbba515415bb19b11f9323d5f7bebd7f24fd6.zip |
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'drivers/input/keyboard/davinci_keyscan.c')
-rw-r--r-- | drivers/input/keyboard/davinci_keyscan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/keyboard/davinci_keyscan.c b/drivers/input/keyboard/davinci_keyscan.c index d410d7a52f1d..a91ee941b5c1 100644 --- a/drivers/input/keyboard/davinci_keyscan.c +++ b/drivers/input/keyboard/davinci_keyscan.c @@ -30,6 +30,7 @@ #include <linux/delay.h> #include <linux/platform_device.h> #include <linux/errno.h> +#include <linux/slab.h> #include <asm/irq.h> |