diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
| commit | baea7b946f00a291b166ccae7fcfed6c01530cc6 (patch) | |
| tree | 4aa275fbdbec9c7b9b4629e8bee2bbecd3c6a6af /arch/arm/mach-omap1/board-generic.c | |
| parent | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (diff) | |
| parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) | |
Merge branch 'origin' into for-linus
Conflicts:
MAINTAINERS
Diffstat (limited to 'arch/arm/mach-omap1/board-generic.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-generic.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c index e724940e86f2..fb47239da72f 100644 --- a/arch/arm/mach-omap1/board-generic.c +++ b/arch/arm/mach-omap1/board-generic.c | |||
| @@ -57,12 +57,7 @@ static struct omap_usb_config generic1610_usb_config __initdata = { | |||
| 57 | }; | 57 | }; |
| 58 | #endif | 58 | #endif |
| 59 | 59 | ||
| 60 | static struct omap_uart_config generic_uart_config __initdata = { | ||
| 61 | .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), | ||
| 62 | }; | ||
| 63 | |||
| 64 | static struct omap_board_config_kernel generic_config[] __initdata = { | 60 | static struct omap_board_config_kernel generic_config[] __initdata = { |
| 65 | { OMAP_TAG_UART, &generic_uart_config }, | ||
| 66 | }; | 61 | }; |
| 67 | 62 | ||
| 68 | static void __init omap_generic_init(void) | 63 | static void __init omap_generic_init(void) |