---

yaml --- r: 102643 b: refs/heads/master c: 92fbc1c h: refs/heads/master i: 102641: 9a4a004 102639: 4ec99d5 v: v3
git-mirror · May 22, 2008 · 241cc05 · 241cc05
1 parent 6d94913
commit 241cc05
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;