Merge branch 'master' of /repos/git/net-next-2.6

Conflicts:
	net/bridge/br_device.c
	net/bridge/br_forward.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c
index 526dc9cbc3c6..770b606a9e3a 100644
--- a/drivers/net/lib8390.c
+++ b/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;
         }