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

[oweals/u-boot.git] / drivers / net / netarm_eth.c

diff --git a/drivers/net/netarm_eth.c b/drivers/net/netarm_eth.c
index a99ee5da2e31a44efcf2bc2a58cebdc6c6997407..c011809b6fd4b2e19ea085fb116a04bea5aa98a2 100644 (file)
--- a/drivers/net/netarm_eth.c
+++ b/drivers/net/netarm_eth.c
@@ -22,16 +22,11 @@
 
 
 #include <common.h>
-
-#ifdef CONFIG_DRIVER_NETARMETH
 #include <command.h>
 #include <net.h>
 #include "netarm_eth.h"
 #include <asm/arch/netarm_registers.h>
 
-
-#if defined(CONFIG_CMD_NET)
-
 static int na_mii_poll_busy (void);
 
 static void na_get_mac_addr (void)
@@ -56,7 +51,6 @@ static void na_get_mac_addr (void)
        setenv ("ethaddr", ethaddr);
 }
 
-
 static void na_mii_write (int reg, int value)
 {
        int mii_addr;
@@ -354,7 +348,3 @@ extern int eth_send (volatile void *packet, int length)
        printf ("eth_send timeout\n");
        return 1;
 }
-
-#endif /* COMMANDS & CFG_NET */
-
-#endif /* CONFIG_DRIVER_NETARMETH */