diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
| commit | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch) | |
| tree | 2624a44924c625c367f3cebf937853b9da2de282 /drivers/net/tokenring/3c359.c | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
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 41e0cd8f4786..465921e3874c 100644 --- a/drivers/net/tokenring/3c359.c +++ b/drivers/net/tokenring/3c359.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | 42 | ||
| 43 | #define XL_DEBUG 0 | 43 | #define XL_DEBUG 0 |
| 44 | 44 | ||
| 45 | #include <linux/config.h> | ||
| 46 | #include <linux/module.h> | 45 | #include <linux/module.h> |
| 47 | #include <linux/kernel.h> | 46 | #include <linux/kernel.h> |
| 48 | #include <linux/errno.h> | 47 | #include <linux/errno.h> |
| @@ -577,7 +576,7 @@ static int xl_open(struct net_device *dev) | |||
| 577 | 576 | ||
| 578 | u16 switchsettings, switchsettings_eeprom ; | 577 | u16 switchsettings, switchsettings_eeprom ; |
| 579 | 578 | ||
| 580 | if(request_irq(dev->irq, &xl_interrupt, SA_SHIRQ , "3c359", dev)) { | 579 | if(request_irq(dev->irq, &xl_interrupt, IRQF_SHARED , "3c359", dev)) { |
| 581 | return -EAGAIN; | 580 | return -EAGAIN; |
| 582 | } | 581 | } |
| 583 | 582 | ||