Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master

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

diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index 51cfb7e3e2cccc95b2a1d4ef99ff42751d513d09..c23a4000a2860cfa596fd864c11da8ff4b22c4b6 100644 (file)
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -63,10 +63,6 @@
 #include "lan91c96.h"
 #include <net.h>
 
-#ifdef CONFIG_DRIVER_LAN91C96
-
-#if defined(CONFIG_CMD_NET)
-
 /*------------------------------------------------------------------------
  *
  * Configuration options, for the experienced user to change.
@@ -865,9 +861,6 @@ static int smc_hw_init ()
 }
 #endif /* 0 */
 
-#endif /* CONFIG_CMD_NET */
-
-
 /* smc_get_ethaddr (bd_t * bd)
  *
  * This checks both the environment and the ROM for an ethernet address. If
@@ -963,5 +956,3 @@ int get_rom_mac (unsigned char *v_rom_mac)
        return (1);
 #endif
 }
-
-#endif /* CONFIG_DRIVER_LAN91C96 */