Merge branches 'topic/fix/misc' and 'topic/fix/asoc' into for-linus

[linux-2.6-omap-h63xx.git] / arch / arm / mach-kirkwood / rd88f6281-setup.c

diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c
index d96487a0f18bfabe9fbca93a5ba24962e64262a3..f785093e433f4f3f8d8feeb460691980a5413e50 100644 (file)
--- a/arch/arm/mach-kirkwood/rd88f6281-setup.c
+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c
@@ -69,7 +69,7 @@ static struct platform_device rd88f6281_nand_flash = {
 };
 
 static struct mv643xx_eth_platform_data rd88f6281_ge00_data = {
-       .phy_addr       = -1,
+       .phy_addr       = MV643XX_ETH_PHY_NONE,
        .speed          = SPEED_1000,
        .duplex         = DUPLEX_FULL,
 };
@@ -90,7 +90,6 @@ static void __init rd88f6281_init(void)
        kirkwood_rtc_init();
        kirkwood_sata_init(&rd88f6281_sata_data);
        kirkwood_uart0_init();
-       kirkwood_uart1_init();
 
        platform_device_register(&rd88f6281_nand_flash);
 }