diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-10-06 15:27:31 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-10-06 15:27:31 -0400 |
commit | 5d347c8abaab1e8c24272a53099c22482855783e (patch) | |
tree | 3e267ced787b4ae18dd2c6275c1b8a83884f96b6 /drivers/net/de600.c | |
parent | e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 (diff) | |
parent | d87dbede030d17770aa6a6170e70ab6f8044e5ae (diff) |
Merge branch 'submit1' of viper:/spare/repo/irq-remove-2.6 into irqcleanups
Diffstat (limited to 'drivers/net/de600.c')
-rw-r--r-- | drivers/net/de600.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/de600.c b/drivers/net/de600.c index d9b006c9e367..690bb40b353d 100644 --- a/drivers/net/de600.c +++ b/drivers/net/de600.c | |||
@@ -265,12 +265,6 @@ static irqreturn_t de600_interrupt(int irq, void *dev_id) | |||
265 | int retrig = 0; | 265 | int retrig = 0; |
266 | int boguscount = 0; | 266 | int boguscount = 0; |
267 | 267 | ||
268 | /* This might just as well be deleted now, no crummy drivers present :-) */ | ||
269 | if ((dev == NULL) || (DE600_IRQ != irq)) { | ||
270 | printk(KERN_ERR "%s: bogus interrupt %d\n", dev?dev->name:"DE-600", irq); | ||
271 | return IRQ_NONE; | ||
272 | } | ||
273 | |||
274 | spin_lock(&de600_lock); | 268 | spin_lock(&de600_lock); |
275 | 269 | ||
276 | select_nic(); | 270 | select_nic(); |