From f82c2771781fc965e3d65b98ba8e1397b2e74697 Mon Sep 17 00:00:00 2001
From: Nikanth Karthikesan <knikanth@suse.de>
Date: Thu, 15 Apr 2010 02:21:23 +0000
Subject: [PATCH] --- yaml --- r: 194313 b: refs/heads/master c:
 6846ad282693bd066645aff6f13d2b279d505314 h: refs/heads/master i:   194311:
 8bc7ec859e359e2696761c552bf329d45826bd7f v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/net/lib8390.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 4f9d67d62ad4..fe5b65b77976 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 989a2979205dd34269382b357e6d4b4b6956b889
+refs/heads/master: 6846ad282693bd066645aff6f13d2b279d505314
diff --git a/trunk/drivers/net/lib8390.c b/trunk/drivers/net/lib8390.c
index 526dc9cbc3c6..770b606a9e3a 100644
--- a/trunk/drivers/net/lib8390.c
+++ b/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;
 	}