diff --git a/[refs] b/[refs]
index bedb4a1fdb2f..4cd75bdaa1ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b0771ab3ea102ce77e9ca83abc500e542402e54
+refs/heads/master: 92fbc1c146d1d358c1ecc4e38361089ff929a02c
diff --git a/trunk/drivers/net/3c515.c b/trunk/drivers/net/3c515.c
index 105a8c7ca7e9..e4e3241628d6 100644
--- a/trunk/drivers/net/3c515.c
+++ b/trunk/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;