From: Gabor Juhos <juhosg@openwrt.org>
Date: Mon, 3 Nov 2008 15:16:52 +0000 (+0000)
Subject: merge r13104 to 8.09
X-Git-Tag: 8.09_rc1~1
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=4fe2932ad518b96e5b6b44b85dfb1fd9236150a2;p=openwrt%2Fsvn-archive%2Fopenwrt.git

merge r13104 to 8.09

SVN-Revision: 13105
---

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb-4xx.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb-4xx.c
index d704d7dcaa..994bfed3d0 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb-4xx.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb-4xx.c
@@ -241,7 +241,6 @@ static void __init rb493_setup(void)
 
 	ar71xx_add_device_mdio(0x3fffff00);
 
-#if 0
 	ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
 	ar71xx_eth0_data.phy_mask = 0;
 	ar71xx_eth0_data.speed = SPEED_100;
@@ -252,7 +251,6 @@ static void __init rb493_setup(void)
 
 	ar71xx_add_device_eth(0);
 	ar71xx_add_device_eth(1);
-#endif
 
 	ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(rb4xx_leds_gpio),
 					rb4xx_leds_gpio);
@@ -262,6 +260,8 @@ static void __init rb493_setup(void)
 					rb4xx_gpio_buttons);
 
 	platform_device_register(&rb4xx_nand_device);
+
+	ar71xx_pci_init(ARRAY_SIZE(rb4xx_pci_irqs), rb4xx_pci_irqs);
 }
 
 MIPS_MACHINE(MACH_AR71XX_RB_493, "MikroTik RouterBOARD 493/AH", rb493_setup);