summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-03-25 22:50:41 +0100
committerWolfgang Denk <wd@denx.de>2008-03-25 22:50:41 +0100
commite0a6140dd381e1eed1ada2291166ef2616d8822b (patch)
tree73978ebbae04b4ae5eee48776d35b3c044e02ad3 /drivers
parente710185aae90c64d39c2d453e40e58ceefe4f250 (diff)
downloadu-boot-imx-e0a6140dd381e1eed1ada2291166ef2616d8822b.zip
u-boot-imx-e0a6140dd381e1eed1ada2291166ef2616d8822b.tar.gz
u-boot-imx-e0a6140dd381e1eed1ada2291166ef2616d8822b.tar.bz2
ne2000 driver: change #ifdef to Makefile conditional compilation
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/Makefile2
-rw-r--r--drivers/net/ne2000.c3
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 321bd08..7d7df9c 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -41,7 +41,7 @@ COBJS-y += lan91c96.o
COBJS-y += macb.o
COBJS-y += mcffec.o
COBJS-y += natsemi.o
-COBJS-y += ne2000.o
+COBJS-$(CONFIG_DRIVER_NE2000) += ne2000.o
COBJS-y += netarm_eth.o
COBJS-y += netconsole.o
COBJS-y += ns7520_eth.o
diff --git a/drivers/net/ne2000.c b/drivers/net/ne2000.c
index 4928014..36ea35b 100644
--- a/drivers/net/ne2000.c
+++ b/drivers/net/ne2000.c
@@ -80,8 +80,6 @@ Add SNMP
#include <net.h>
#include <malloc.h>
-#ifdef CONFIG_DRIVER_NE2000
-
#define mdelay(n) udelay((n)*1000)
/* forward definition of function used for the uboot interface */
void uboot_push_packet_len(int len);
@@ -851,4 +849,3 @@ int eth_send(volatile void *packet, int length) {
}
return 0;
}
-#endif