diff options
author | Olaf Hering <olh@suse.de> | 2005-07-27 14:45:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 19:26:08 -0400 |
commit | 44456d37b59d8e541936ed26d8b6e08d27e88ac1 (patch) | |
tree | 11ca6fa29b8cfb56ecef2d1f4f9dc2d9d71d2a2f /drivers/net | |
parent | 02b775696fee75a04041d8d94db26a9462216d24 (diff) |
[PATCH] turn many #if $undefined_string into #ifdef $undefined_string
turn many #if $undefined_string into #ifdef $undefined_string to fix some
warnings after -Wno-def was added to global CFLAGS
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/8139too.c | 6 | ||||
-rwxr-xr-x | drivers/net/amd8111e.c | 2 | ||||
-rw-r--r-- | drivers/net/ne.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index 5a4a08a7c951..4c2cf7bbd252 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c | |||
@@ -126,14 +126,14 @@ | |||
126 | #define USE_IO_OPS 1 | 126 | #define USE_IO_OPS 1 |
127 | #endif | 127 | #endif |
128 | 128 | ||
129 | /* define to 1 to enable copious debugging info */ | 129 | /* define to 1, 2 or 3 to enable copious debugging info */ |
130 | #undef RTL8139_DEBUG | 130 | #define RTL8139_DEBUG 0 |
131 | 131 | ||
132 | /* define to 1 to disable lightweight runtime debugging checks */ | 132 | /* define to 1 to disable lightweight runtime debugging checks */ |
133 | #undef RTL8139_NDEBUG | 133 | #undef RTL8139_NDEBUG |
134 | 134 | ||
135 | 135 | ||
136 | #ifdef RTL8139_DEBUG | 136 | #if RTL8139_DEBUG |
137 | /* note: prints function name for you */ | 137 | /* note: prints function name for you */ |
138 | # define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args) | 138 | # define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args) |
139 | #else | 139 | #else |
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index 8618012df06a..d9ba8be72af8 100755 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c | |||
@@ -1290,7 +1290,7 @@ static irqreturn_t amd8111e_interrupt(int irq, void *dev_id, struct pt_regs *reg | |||
1290 | writel(intr0, mmio + INT0); | 1290 | writel(intr0, mmio + INT0); |
1291 | 1291 | ||
1292 | /* Check if Receive Interrupt has occurred. */ | 1292 | /* Check if Receive Interrupt has occurred. */ |
1293 | #if CONFIG_AMD8111E_NAPI | 1293 | #ifdef CONFIG_AMD8111E_NAPI |
1294 | if(intr0 & RINT0){ | 1294 | if(intr0 & RINT0){ |
1295 | if(netif_rx_schedule_prep(dev)){ | 1295 | if(netif_rx_schedule_prep(dev)){ |
1296 | /* Disable receive interupts */ | 1296 | /* Disable receive interupts */ |
diff --git a/drivers/net/ne.c b/drivers/net/ne.c index 6c57096aa2e1..d209a1556b2e 100644 --- a/drivers/net/ne.c +++ b/drivers/net/ne.c | |||
@@ -129,9 +129,9 @@ bad_clone_list[] __initdata = { | |||
129 | #define NESM_START_PG 0x40 /* First page of TX buffer */ | 129 | #define NESM_START_PG 0x40 /* First page of TX buffer */ |
130 | #define NESM_STOP_PG 0x80 /* Last page +1 of RX ring */ | 130 | #define NESM_STOP_PG 0x80 /* Last page +1 of RX ring */ |
131 | 131 | ||
132 | #ifdef CONFIG_PLAT_MAPPI | 132 | #if defined(CONFIG_PLAT_MAPPI) |
133 | # define DCR_VAL 0x4b | 133 | # define DCR_VAL 0x4b |
134 | #elif CONFIG_PLAT_OAKS32R | 134 | #elif defined(CONFIG_PLAT_OAKS32R) |
135 | # define DCR_VAL 0x48 | 135 | # define DCR_VAL 0x48 |
136 | #else | 136 | #else |
137 | # define DCR_VAL 0x49 | 137 | # define DCR_VAL 0x49 |