Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / net / smc91x.c

diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 57e6426f01aa0ddeb0eb67bcee196a251c4112c0..03b592c350a1883f4455f08428f6089f40d0f129 100644 (file)
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -1331,9 +1331,11 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id)
        SMC_SET_INT_MASK(mask);
        spin_unlock(&lp->lock);
 
+#ifndef CONFIG_NET_POLL_CONTROLLER
        if (timeout == MAX_IRQ_LOOPS)
                PRINTK("%s: spurious interrupt (mask = 0x%02x)\n",
                       dev->name, mask);
+#endif
        DBG(3, "%s: Interrupt done (%d loops)\n",
               dev->name, MAX_IRQ_LOOPS - timeout);