diff options
author | Wolfgang Denk <wd@denx.de> | 2008-06-11 22:17:42 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-06-11 22:17:42 +0200 |
commit | 32d4e38eeb5bcc2f854787bfa68bea2b55eaa1d7 (patch) | |
tree | 35b56ce4860d33a3b75358251c6e4e4e7bdb38f9 /drivers/net/natsemi.c | |
parent | 1730edf76c54381475e2da11f75b1ce563c4e62c (diff) | |
parent | 3b904ccb93c3196727e2e9870cb1df903cab19ad (diff) | |
download | u-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/natsemi.c')
-rw-r--r-- | drivers/net/natsemi.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index a523959..4aee048 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c @@ -56,9 +56,6 @@ #include <asm/io.h> #include <pci.h> -#if defined(CONFIG_CMD_NET) \ - && defined(CONFIG_NET_MULTI) && defined(CONFIG_NATSEMI) - /* defines */ #define EEPROM_SIZE 0xb /*12 16-bit chunks, or 24 bytes*/ @@ -878,5 +875,3 @@ natsemi_disable(struct eth_device *dev) /* Restore PME enable bit */ OUTL(dev, SavedClkRun, ClkRun); } - -#endif |