Merge branch 'linus' into x86/urgent

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;