diff options
| author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2007-05-01 00:27:49 +0900 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-05-08 01:23:09 -0400 |
| commit | 1c08bf10658921dafae8d66be0effc915a209ab0 (patch) | |
| tree | 108a955cfb627b44bee559e7ddd705a973a358fc /drivers/net | |
| parent | f0e93c10faf08e8840a0b7a44abccb520ead12df (diff) | |
| download | blackbird-op-linux-1c08bf10658921dafae8d66be0effc915a209ab0.tar.gz blackbird-op-linux-1c08bf10658921dafae8d66be0effc915a209ab0.zip | |
ne: Add NEEDS_PORTLIST to control ISA auto-probe
Add NEEDS_PORTLIST cpp macro to control ISA auto-probe.
(I'm not sure M32R needs auto-probe but it is current behavior)
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
| -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[] = /* Do we have a non std. amount of memory? (in units of 256 byte pages) */ /* #define PACKETBUF_MEMSIZE 0x40 */ +#if !defined(MODULE) && (defined(CONFIG_ISA) || defined(CONFIG_M32R)) +/* Do we need a portlist for the ISA auto-probe ? */ +#define NEEDS_PORTLIST +#endif + /* A zero-terminated list of I/O addresses to be probed at boot. */ -#ifndef MODULE +#ifdef NEEDS_PORTLIST static unsigned int netcard_portlist[] __initdata = { 0x300, 0x280, 0x320, 0x340, 0x360, 0x380, 0 }; @@ -186,7 +191,7 @@ static void ne_block_output(struct net_device *dev, const int count, static int __init do_ne_probe(struct net_device *dev) { unsigned long base_addr = dev->base_addr; -#ifndef MODULE +#ifdef NEEDS_PORTLIST int orig_irq = dev->irq; #endif @@ -202,7 +207,7 @@ static int __init do_ne_probe(struct net_device *dev) if (isapnp_present() && (ne_probe_isapnp(dev) == 0)) return 0; -#ifndef MODULE +#ifdef NEEDS_PORTLIST /* Last resort. The semi-risky ISA auto-probe. */ for (base_addr = 0; netcard_portlist[base_addr] != 0; base_addr++) { int ioaddr = netcard_portlist[base_addr]; |
