diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-19 01:19:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-19 01:19:03 -0500 |
| commit | 3505d1a9fd65e2d3e00827857b6795d9d8983658 (patch) | |
| tree | 941cfafdb57c427bb6b7ebf6354ee93b2a3693b5 /arch/arm/mach-omap2/board-rx51.c | |
| parent | dfef948ed2ba69cf041840b5e860d6b4e16fa0b1 (diff) | |
| parent | 66b00a7c93ec782d118d2c03bd599cfd041e80a1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/sfc/sfe4001.c
drivers/net/wireless/libertas/cmd.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/rtl8187se/Kconfig
drivers/staging/rtl8192e/Kconfig
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c index f9196c3b1a7b..78869a9a1cc2 100644 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <mach/mux.h> | 26 | #include <mach/mux.h> |
| 27 | #include <mach/board.h> | 27 | #include <mach/board.h> |
| 28 | #include <mach/common.h> | 28 | #include <mach/common.h> |
| 29 | #include <mach/keypad.h> | ||
| 30 | #include <mach/dma.h> | 29 | #include <mach/dma.h> |
| 31 | #include <mach/gpmc.h> | 30 | #include <mach/gpmc.h> |
| 32 | #include <mach/usb.h> | 31 | #include <mach/usb.h> |