Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[net-next-2.6.git] / arch / arm / mach-omap2 / board-apollon.c

diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c
index b4d4ef6d90b9953274710768526de79a4269acd4..a1132288c7015bbcaf51b0764968f9a29a72b449 100644 (file)
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@ -248,18 +248,6 @@ out:
        clk_put(gpmc_fck);
 }
 
-static void __init omap_apollon_init_irq(void)
-{
-       omap2_init_common_hw(NULL, NULL);
-       omap_init_irq();
-       omap_gpio_init();
-       apollon_init_smc91x();
-}
-
-static struct omap_uart_config apollon_uart_config __initdata = {
-       .enabled_uarts = (1 << 0) | (0 << 1) | (0 << 2),
-};
-
 static struct omap_usb_config apollon_usb_config __initdata = {
        .register_dev   = 1,
        .hmc_mode       = 0x14, /* 0:dev 1:host1 2:disable */
@@ -272,10 +260,19 @@ static struct omap_lcd_config apollon_lcd_config __initdata = {
 };
 
 static struct omap_board_config_kernel apollon_config[] = {
-       { OMAP_TAG_UART,        &apollon_uart_config },
        { OMAP_TAG_LCD,         &apollon_lcd_config },
 };
 
+static void __init omap_apollon_init_irq(void)
+{
+       omap_board_config = apollon_config;
+       omap_board_config_size = ARRAY_SIZE(apollon_config);
+       omap2_init_common_hw(NULL, NULL);
+       omap_init_irq();
+       omap_gpio_init();
+       apollon_init_smc91x();
+}
+
 static void __init apollon_led_init(void)
 {
        /* LED0 - AA10 */
@@ -324,8 +321,6 @@ static void __init omap_apollon_init(void)
         * if not needed.
         */
        platform_add_devices(apollon_devices, ARRAY_SIZE(apollon_devices));
-       omap_board_config = apollon_config;
-       omap_board_config_size = ARRAY_SIZE(apollon_config);
        omap_serial_init();
 }