summaryrefslogtreecommitdiff
path: root/drivers/net/s3c4510b_eth.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-06-11 22:17:42 +0200
committerWolfgang Denk <wd@denx.de>2008-06-11 22:17:42 +0200
commit32d4e38eeb5bcc2f854787bfa68bea2b55eaa1d7 (patch)
tree35b56ce4860d33a3b75358251c6e4e4e7bdb38f9 /drivers/net/s3c4510b_eth.c
parent1730edf76c54381475e2da11f75b1ce563c4e62c (diff)
parent3b904ccb93c3196727e2e9870cb1df903cab19ad (diff)
downloadu-boot-imx-32d4e38eeb5bcc2f854787bfa68bea2b55eaa1d7.zip
u-boot-imx-32d4e38eeb5bcc2f854787bfa68bea2b55eaa1d7.tar.gz
u-boot-imx-32d4e38eeb5bcc2f854787bfa68bea2b55eaa1d7.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-net
Diffstat (limited to 'drivers/net/s3c4510b_eth.c')
-rw-r--r--drivers/net/s3c4510b_eth.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/s3c4510b_eth.c b/drivers/net/s3c4510b_eth.c
index 3d9066a..6dcb244 100644
--- 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