diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-12-17 22:59:27 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-12-17 22:59:27 +0100 |
| commit | b6535daefd65c93ea429bc4728062379dda6e482 (patch) | |
| tree | 2ba6d227112143d5e522a2aca72a85671e08bd55 /net/eth.c | |
| parent | e5e4e705ce402856a4800ebf4c0cc163d41b58b0 (diff) | |
| parent | 1ab70f6fff9fa3b7910c11b874f625e004256c50 (diff) | |
Merge branch 'next' of git://git.denx.de/u-boot-net
Diffstat (limited to 'net/eth.c')
| -rw-r--r-- | net/eth.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/eth.c b/net/eth.c index 9b503124fb6..b650a20247f 100644 --- a/net/eth.c +++ b/net/eth.c @@ -26,7 +26,6 @@ #include <net.h> #include <miiphy.h> -#ifdef CONFIG_CMD_NET void eth_parse_enetaddr(const char *addr, uchar *enetaddr) { char *end; @@ -60,9 +59,8 @@ int eth_getenv_enetaddr_by_index(int index, uchar *enetaddr) sprintf(enetvar, index ? "eth%daddr" : "ethaddr", index); return eth_getenv_enetaddr(enetvar, enetaddr); } -#endif -#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) +#ifdef CONFIG_NET_MULTI /* * CPU and board-specific Ethernet initializations. Aliased function @@ -492,7 +490,8 @@ char *eth_get_name (void) { return (eth_current ? eth_current->name : "unknown"); } -#elif defined(CONFIG_CMD_NET) && !defined(CONFIG_NET_MULTI) + +#else /* !CONFIG_NET_MULTI */ #warning Ethernet driver is deprecated. Please update to use CONFIG_NET_MULTI |