diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-26 04:50:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-26 04:50:42 -0500 |
| commit | 16bc67edeb49b531940b2ba6c183780a1b5c472d (patch) | |
| tree | 71b4bc48e47e54f2c0b3126d8f81d2f31b707ea8 /arch/arm/mach-omap2/board-ldp.c | |
| parent | f6630114d9198aa959ac95c131334c020038f253 (diff) | |
| parent | 047106adcc85e3023da210143a6ab8a55df9e0fc (diff) | |
Merge branch 'sched/urgent' into sched/core
Merge reason: Pick up fixes that did not make it into .32.0
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-omap2/board-ldp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-ldp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index d110a7fdfbd8..d57ec2f4d0a9 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
| 17 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
| 18 | #include <linux/input.h> | 18 | #include <linux/input.h> |
| 19 | #include <linux/input/matrix_keypad.h> | ||
| 19 | #include <linux/gpio_keys.h> | 20 | #include <linux/gpio_keys.h> |
| 20 | #include <linux/workqueue.h> | 21 | #include <linux/workqueue.h> |
| 21 | #include <linux/err.h> | 22 | #include <linux/err.h> |
| @@ -41,7 +42,6 @@ | |||
| 41 | #include <asm/delay.h> | 42 | #include <asm/delay.h> |
| 42 | #include <mach/control.h> | 43 | #include <mach/control.h> |
| 43 | #include <mach/usb.h> | 44 | #include <mach/usb.h> |
| 44 | #include <mach/keypad.h> | ||
| 45 | 45 | ||
| 46 | #include "mmc-twl4030.h" | 46 | #include "mmc-twl4030.h" |
| 47 | 47 | ||