diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-29 03:31:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-29 03:31:03 -0700 |
| commit | a5b17df04c4ad8f25fc598fce37fccb4b387c94c (patch) | |
| tree | 2d0084f6db86362eb067b617ff8470f255ba37e7 /drivers/net/3c515.c | |
| parent | b79eeeb9e48457579cb742cd02e162fcd673c4a3 (diff) | |
| parent | c03571a3e22b821e5be7bda7b166c4554770f489 (diff) | |
| download | kernel-crypto-a5b17df04c4ad8f25fc598fce37fccb4b387c94c.tar.gz kernel-crypto-a5b17df04c4ad8f25fc598fce37fccb4b387c94c.tar.xz kernel-crypto-a5b17df04c4ad8f25fc598fce37fccb4b387c94c.zip | |
Merge branch 'upstream-next-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/3c515.c')
| -rw-r--r-- | drivers/net/3c515.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c index 105a8c7ca7e..e4e3241628d 100644 --- a/drivers/net/3c515.c +++ b/drivers/net/3c515.c @@ -572,12 +572,16 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr, int irq; DECLARE_MAC_BUF(mac); +#ifdef __ISAPNP__ if (idev) { irq = pnp_irq(idev, 0); vp->dev = &idev->dev; } else { irq = inw(ioaddr + 0x2002) & 15; } +#else + irq = inw(ioaddr + 0x2002) & 15; +#endif dev->base_addr = ioaddr; dev->irq = irq; |