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

[u-boot] / drivers / net / s3c4510b_eth.c

diff --git a/drivers/net/s3c4510b_eth.c b/drivers/net/s3c4510b_eth.c
index 3d9066abeaf781812934a04350c3fb8c31bf0b64..6dcb244861b6210c4a45c93e6888a7c2143ad734 100644 (file)
--- a/drivers/net/s3c4510b_eth.c
+++ b/drivers/net/s3c4510b_eth.c
@@ -25,9 +25,6 @@
  */
 
 #include <common.h>
-
-#ifdef CONFIG_DRIVER_S3C4510_ETH
-
 #include <command.h>
 #include <net.h>
 #include <asm/hardware.h>
@@ -242,5 +239,3 @@ void eth_halt(void)
        /* disable MAC */
        PUT_REG( REG_MACCON, ETH_HaltReg);
 }
-
-#endif