Merge branch 'linus' into x86/x2apic

[linux-2.6-omap-h63xx.git] / arch / arm / mach-orion5x / ts209-setup.c

diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
index dd657163cd8d09e48ed791a9a0a472112ba235ba..9d6890514199759919b211859e8a864f4a6db7e8 100644 (file)
--- a/arch/arm/mach-orion5x/ts209-setup.c
+++ b/arch/arm/mach-orion5x/ts209-setup.c
@@ -287,6 +287,10 @@ static void __init qnap_ts209_init(void)
        /*
         * Configure peripherals.
         */
+       orion5x_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE,
+                                  QNAP_TS209_NOR_BOOT_SIZE);
+       platform_device_register(&qnap_ts209_nor_flash);
+
        orion5x_ehci0_init();
        orion5x_ehci1_init();
        qnap_tsx09_find_mac_addr(QNAP_TS209_NOR_BOOT_BASE +
@@ -296,12 +300,9 @@ static void __init qnap_ts209_init(void)
        orion5x_i2c_init();
        orion5x_sata_init(&qnap_ts209_sata_data);
        orion5x_uart0_init();
+       orion5x_uart1_init();
        orion5x_xor_init();
 
-       orion5x_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE,
-                                  QNAP_TS209_NOR_BOOT_SIZE);
-       platform_device_register(&qnap_ts209_nor_flash);
-
        platform_device_register(&qnap_ts209_button_device);
 
        /* Get RTC IRQ and register the chip */