Merge branch 'master' of git://git.denx.de/u-boot-samsung

[platform/kernel/u-boot.git] / board / spear / spear600 / spear600.c

diff --git a/board/spear/spear600/spear600.c b/board/spear/spear600/spear600.c
index e996a0e..2a54b8b 100644 (file)
--- a/board/spear/spear600/spear600.c
+++ b/board/spear/spear600/spear600.c
@@ -11,6 +11,7 @@
 #include <nand.h>
 #include <asm/io.h>
 #include <linux/mtd/fsmc_nand.h>
+#include <asm/mach-types.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_defs.h>
 #include <asm/arch/spr_misc.h>
@@ -46,13 +47,9 @@ int board_eth_init(bd_t *bis)
 {
        int ret = 0;
 
-#if defined(CONFIG_DESIGNWARE_ETH)
+#if defined(CONFIG_ETH_DESIGNWARE)
        u32 interface = PHY_INTERFACE_MODE_MII;
-#if defined(CONFIG_DW_AUTONEG)
-       interface = PHY_INTERFACE_MODE_GMII;
-#endif
-       if (designware_initialize(0, CONFIG_SPEAR_ETHBASE, CONFIG_DW0_PHY,
-                               interface) >= 0)
+       if (designware_initialize(CONFIG_SPEAR_ETHBASE, interface) >= 0)
                ret++;
 #endif
        return ret;