Commit 92fbc1c1 authored May 16, 2008 by Randy Dunlap Committed by Jeff Garzik May 22, 2008

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: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

parent 1b0771ab

drivers/net/3c515.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -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;