diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/net/smc-ultra.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/smc-ultra.c')
| -rw-r--r-- | drivers/net/smc-ultra.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c index 7986514883ac..889ef0d7c374 100644 --- a/drivers/net/smc-ultra.c +++ b/drivers/net/smc-ultra.c | |||
| @@ -127,7 +127,7 @@ MODULE_DEVICE_TABLE(isapnp, ultra_device_ids); | |||
| 127 | static void ultra_poll(struct net_device *dev) | 127 | static void ultra_poll(struct net_device *dev) |
| 128 | { | 128 | { |
| 129 | disable_irq(dev->irq); | 129 | disable_irq(dev->irq); |
| 130 | ei_interrupt(dev->irq, dev, NULL); | 130 | ei_interrupt(dev->irq, dev); |
| 131 | enable_irq(dev->irq); | 131 | enable_irq(dev->irq); |
| 132 | } | 132 | } |
| 133 | #endif | 133 | #endif |