Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/ehea/ehea_main.c
	drivers/net/wireless/iwlwifi/Kconfig
	drivers/net/wireless/rt2x00/rt61pci.c
	net/ipv4/inet_timewait_sock.c
	net/ipv6/raw.c
	net/mac80211/ieee80211_sta.c

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 97bdb2a43bc8..600b92af3334 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -1326,9 +1326,11 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id)
         SMC_SET_INT_MASK(lp, 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);