---

yaml
---
r: 194313
b: refs/heads/master
c: 6846ad2
h: refs/heads/master
i:
  194311: 8bc7ec8
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 989a2979205dd34269382b357e6d4b4b6956b889
+refs/heads/master: 6846ad282693bd066645aff6f13d2b279d505314

trunk/drivers/net/lib8390.c

@@ -445,14 +445,14 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id)
 
 	if (ei_local->irqlock)
 	{
-#if 1 /* This might just be an interrupt for a PCI device sharing this line */
-		/* The "irqlock" check is only for testing. */
-		printk(ei_local->irqlock
-			   ? "%s: Interrupted while interrupts are masked! isr=%#2x imr=%#2x.\n"
-			   : "%s: Reentering the interrupt handler! isr=%#2x imr=%#2x.\n",
+		/*
+		 * This might just be an interrupt for a PCI device sharing
+		 * this line
+		 */
+		printk("%s: Interrupted while interrupts are masked!"
+			   " isr=%#2x imr=%#2x.\n",
 			   dev->name, ei_inb_p(e8390_base + EN0_ISR),
 			   ei_inb_p(e8390_base + EN0_IMR));
-#endif
 		spin_unlock(&ei_local->page_lock);
 		return IRQ_NONE;
 	}