diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/input/keyboard/omap-keypad.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/input/keyboard/omap-keypad.c')
| -rw-r--r-- | drivers/input/keyboard/omap-keypad.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index bba85add35a3..a72e61ddca91 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c | |||
| @@ -34,13 +34,14 @@ | |||
| 34 | #include <linux/platform_device.h> | 34 | #include <linux/platform_device.h> |
| 35 | #include <linux/mutex.h> | 35 | #include <linux/mutex.h> |
| 36 | #include <linux/errno.h> | 36 | #include <linux/errno.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | #include <mach/gpio.h> | 38 | #include <mach/gpio.h> |
| 38 | #include <mach/keypad.h> | 39 | #include <plat/keypad.h> |
| 39 | #include <mach/menelaus.h> | 40 | #include <plat/menelaus.h> |
| 40 | #include <asm/irq.h> | 41 | #include <asm/irq.h> |
| 41 | #include <mach/hardware.h> | 42 | #include <mach/hardware.h> |
| 42 | #include <asm/io.h> | 43 | #include <asm/io.h> |
| 43 | #include <mach/mux.h> | 44 | #include <plat/mux.h> |
| 44 | 45 | ||
| 45 | #undef NEW_BOARD_LEARNING_MODE | 46 | #undef NEW_BOARD_LEARNING_MODE |
| 46 | 47 | ||