diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /drivers/net/b44.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/b44.c')
| -rw-r--r-- | drivers/net/b44.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index e046943ef29d..2a9132343b66 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c | |||
| @@ -912,9 +912,6 @@ static irqreturn_t b44_interrupt(int irq, void *dev_id) | |||
| 912 | bp->istat = istat; | 912 | bp->istat = istat; |
| 913 | __b44_disable_ints(bp); | 913 | __b44_disable_ints(bp); |
| 914 | __napi_schedule(&bp->napi); | 914 | __napi_schedule(&bp->napi); |
| 915 | } else { | ||
| 916 | printk(KERN_ERR PFX "%s: Error, poll already scheduled\n", | ||
| 917 | dev->name); | ||
| 918 | } | 915 | } |
| 919 | 916 | ||
| 920 | irq_ack: | 917 | irq_ack: |