diff options
author | Steve French <sfrench@us.ibm.com> | 2008-04-15 18:38:29 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-04-15 18:38:29 +0000 |
commit | e48d199ba10bb8267f491a3a585ca4a833e950a4 (patch) | |
tree | c7d308a42479c8f21aaef889abfa004b0f1bb482 /drivers/net/smc91x.c | |
parent | cce246ee5f3c7f4d3539ea41d13feb7a07859145 (diff) | |
parent | 0de19a456cb59106420864927fdec152310f70b6 (diff) |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/smc91x.c')
-rw-r--r-- | drivers/net/smc91x.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index 4020e9e955b3..63a54e29d563 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(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); |