diff options
-rw-r--r-- | drivers/net/ne.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/ne.c b/drivers/net/ne.c index 32ae91b0b611..22d6fe45375e 100644 --- a/drivers/net/ne.c +++ b/drivers/net/ne.c | |||
@@ -78,8 +78,13 @@ static const char version2[] = | |||
78 | /* Do we have a non std. amount of memory? (in units of 256 byte pages) */ | 78 | /* Do we have a non std. amount of memory? (in units of 256 byte pages) */ |
79 | /* #define PACKETBUF_MEMSIZE 0x40 */ | 79 | /* #define PACKETBUF_MEMSIZE 0x40 */ |
80 | 80 | ||
81 | #if !defined(MODULE) && (defined(CONFIG_ISA) || defined(CONFIG_M32R)) | ||
82 | /* Do we need a portlist for the ISA auto-probe ? */ | ||
83 | #define NEEDS_PORTLIST | ||
84 | #endif | ||
85 | |||
81 | /* A zero-terminated list of I/O addresses to be probed at boot. */ | 86 | /* A zero-terminated list of I/O addresses to be probed at boot. */ |
82 | #ifndef MODULE | 87 | #ifdef NEEDS_PORTLIST |
83 | static unsigned int netcard_portlist[] __initdata = { | 88 | static unsigned int netcard_portlist[] __initdata = { |
84 | 0x300, 0x280, 0x320, 0x340, 0x360, 0x380, 0 | 89 | 0x300, 0x280, 0x320, 0x340, 0x360, 0x380, 0 |
85 | }; | 90 | }; |
@@ -186,7 +191,7 @@ static void ne_block_output(struct net_device *dev, const int count, | |||
186 | static int __init do_ne_probe(struct net_device *dev) | 191 | static int __init do_ne_probe(struct net_device *dev) |
187 | { | 192 | { |
188 | unsigned long base_addr = dev->base_addr; | 193 | unsigned long base_addr = dev->base_addr; |
189 | #ifndef MODULE | 194 | #ifdef NEEDS_PORTLIST |
190 | int orig_irq = dev->irq; | 195 | int orig_irq = dev->irq; |
191 | #endif | 196 | #endif |
192 | 197 | ||
@@ -202,7 +207,7 @@ static int __init do_ne_probe(struct net_device *dev) | |||
202 | if (isapnp_present() && (ne_probe_isapnp(dev) == 0)) | 207 | if (isapnp_present() && (ne_probe_isapnp(dev) == 0)) |
203 | return 0; | 208 | return 0; |
204 | 209 | ||
205 | #ifndef MODULE | 210 | #ifdef NEEDS_PORTLIST |
206 | /* Last resort. The semi-risky ISA auto-probe. */ | 211 | /* Last resort. The semi-risky ISA auto-probe. */ |
207 | for (base_addr = 0; netcard_portlist[base_addr] != 0; base_addr++) { | 212 | for (base_addr = 0; netcard_portlist[base_addr] != 0; base_addr++) { |
208 | int ioaddr = netcard_portlist[base_addr]; | 213 | int ioaddr = netcard_portlist[base_addr]; |