diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2008-05-16 10:35:24 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-05-22 06:34:34 -0400 |
| commit | 92fbc1c146d1d358c1ecc4e38361089ff929a02c (patch) | |
| tree | 0c7589e30eb2d89a0febadd1f42db9928ff4f114 /drivers/net/3c515.c | |
| parent | 1b0771ab3ea102ce77e9ca83abc500e542402e54 (diff) | |
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>
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 105a8c7ca7e9..e4e3241628d6 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; |