---

yaml --- r: 31836 b: refs/heads/master c: 0a9da4b h: refs/heads/master v: v3
git-mirror · Jul 3, 2006 · 35b9c8a · 35b9c8a
1 parent 9b73f21
commit 35b9c8a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e745165c6d235c03e9fa0e57984ca6fd3d3b2c50
+refs/heads/master: 0a9da4bd8eb30fb3f36e841c2cc72e426a17bbe2
diff --git a/trunk/drivers/net/3c59x.c b/trunk/drivers/net/3c59x.c
@@ -1897,7 +1897,7 @@ vortex_timer(unsigned long data)
 		printk(KERN_DEBUG "dev->watchdog_timeo=%d\n", dev->watchdog_timeo);
 	}
 
-	disable_irq(dev->irq);
+	disable_irq_lockdep(dev->irq);
 	old_window = ioread16(ioaddr + EL3_CMD) >> 13;
 	EL3WINDOW(4);
 	media_status = ioread16(ioaddr + Wn4_Media);
@@ -1978,7 +1978,7 @@ vortex_timer(unsigned long data)
 			 dev->name, media_tbl[dev->if_port].name);
 
 	EL3WINDOW(old_window);
-	enable_irq(dev->irq);
+	enable_irq_lockdep(dev->irq);
 	mod_timer(&vp->timer, RUN_AT(next_tick));
 	if (vp->deferred)
 		iowrite16(FakeIntr, ioaddr + EL3_CMD);