diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-11-04 02:10:35 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-04 02:10:35 -0500 |
| commit | b6d0137d6156db54a9e6ff74458ed4342a45abb5 (patch) | |
| tree | ae4139b2af5af7e382208645d4b66ff184c1e53a /arch/arm/mach-omap2/board-omap3evm.c | |
| parent | 5c1a56b5f616f7063f91eb85f0ea209658f387dc (diff) | |
| parent | 51bb296b09a83ee1aae025778db38f9d2cc7bb1a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3evm.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3evm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index e4ec0c591216..4c4d7f8dbd72 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/clk.h> | 20 | #include <linux/clk.h> |
| 21 | #include <linux/gpio.h> | 21 | #include <linux/gpio.h> |
| 22 | #include <linux/input.h> | 22 | #include <linux/input.h> |
| 23 | #include <linux/input/matrix_keypad.h> | ||
| 23 | #include <linux/leds.h> | 24 | #include <linux/leds.h> |
| 24 | 25 | ||
| 25 | #include <linux/spi/spi.h> | 26 | #include <linux/spi/spi.h> |
| @@ -37,7 +38,6 @@ | |||
| 37 | #include <mach/usb.h> | 38 | #include <mach/usb.h> |
| 38 | #include <mach/common.h> | 39 | #include <mach/common.h> |
| 39 | #include <mach/mcspi.h> | 40 | #include <mach/mcspi.h> |
| 40 | #include <mach/keypad.h> | ||
| 41 | 41 | ||
| 42 | #include "sdram-micron-mt46h32m32lf-6.h" | 42 | #include "sdram-micron-mt46h32m32lf-6.h" |
| 43 | #include "mmc-twl4030.h" | 43 | #include "mmc-twl4030.h" |