Commit 92fbc1c1 authored by Randy Dunlap's avatar Randy Dunlap Committed by Jeff Garzik

3c515: fix using pnp_get_resource when CONFIG_ISAPNP=n

3c515.c uses pnp_irq(), which calls pnp_get_resource(),
which is not defined when CONFIG_PNP=n, so in that case,
get the IRQ from a hardware register.

3c515.c:(.text+0x3adc0): undefined reference to `pnp_get_resource'
Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 1b0771ab
...@@ -572,12 +572,16 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr, ...@@ -572,12 +572,16 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,
int irq; int irq;
DECLARE_MAC_BUF(mac); DECLARE_MAC_BUF(mac);
#ifdef __ISAPNP__
if (idev) { if (idev) {
irq = pnp_irq(idev, 0); irq = pnp_irq(idev, 0);
vp->dev = &idev->dev; vp->dev = &idev->dev;
} else { } else {
irq = inw(ioaddr + 0x2002) & 15; irq = inw(ioaddr + 0x2002) & 15;
} }
#else
irq = inw(ioaddr + 0x2002) & 15;
#endif
dev->base_addr = ioaddr; dev->base_addr = ioaddr;
dev->irq = irq; dev->irq = irq;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment