From e0a6140dd381e1eed1ada2291166ef2616d8822b Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Tue, 25 Mar 2008 22:50:41 +0100 Subject: [PATCH] ne2000 driver: change #ifdef to Makefile conditional compilation Signed-off-by: Wolfgang Denk --- drivers/net/Makefile | 2 +- drivers/net/ne2000.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 321bd08ad..7d7df9cab 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 49280148d..36ea35b2c 100644 --- a/drivers/net/ne2000.c +++ b/drivers/net/ne2000.c @@ -80,8 +80,6 @@ Add SNMP #include #include -#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