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/tokenring/3c359.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/tokenring/3c359.c')
| -rw-r--r-- | drivers/net/tokenring/3c359.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c index 724158966ec..cf552d1d962 100644 --- a/drivers/net/tokenring/3c359.c +++ b/drivers/net/tokenring/3c359.c | |||
| @@ -610,9 +610,8 @@ static int xl_open(struct net_device *dev) | |||
| 610 | 610 | ||
| 611 | u16 switchsettings, switchsettings_eeprom ; | 611 | u16 switchsettings, switchsettings_eeprom ; |
| 612 | 612 | ||
| 613 | if(request_irq(dev->irq, &xl_interrupt, IRQF_SHARED , "3c359", dev)) { | 613 | if (request_irq(dev->irq, xl_interrupt, IRQF_SHARED , "3c359", dev)) |
| 614 | return -EAGAIN; | 614 | return -EAGAIN; |
| 615 | } | ||
| 616 | 615 | ||
| 617 | /* | 616 | /* |
| 618 | * Read the information from the EEPROM that we need. | 617 | * Read the information from the EEPROM that we need. |