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

Conflicts:

	arch/sparc64/kernel/pci_psycho.c

1 files changed, 5 insertions, 4 deletions

diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
index dd657163cd8d..9d6890514199 100644
--- 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 */