From 6ac59c5518e1d2e2ef1c4b8dee99267dfbdf9cdc Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 3 Nov 2009 11:35:42 -0500 Subject: net: pull CONFIG checks out of source and into makefile Signed-off-by: Mike Frysinger Signed-off-by: Ben Warren --- net/eth.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'net/eth.c') diff --git a/net/eth.c b/net/eth.c index 9b503124f..b650a2024 100644 --- a/net/eth.c +++ b/net/eth.c @@ -26,7 +26,6 @@ #include #include -#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 -- cgit v1.2.3