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/ns83820.c | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/net/ns83820.c')
| -rw-r--r-- | drivers/net/ns83820.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c index 706aed7d717f..70429108c40d 100644 --- a/drivers/net/ns83820.c +++ b/drivers/net/ns83820.c | |||
| @@ -96,7 +96,6 @@ | |||
| 96 | //#define dprintk printk | 96 | //#define dprintk printk |
| 97 | #define dprintk(x...) do { } while (0) | 97 | #define dprintk(x...) do { } while (0) |
| 98 | 98 | ||
| 99 | #include <linux/config.h> | ||
| 100 | #include <linux/module.h> | 99 | #include <linux/module.h> |
| 101 | #include <linux/moduleparam.h> | 100 | #include <linux/moduleparam.h> |
| 102 | #include <linux/types.h> | 101 | #include <linux/types.h> |
| @@ -1882,7 +1881,7 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_ | |||
| 1882 | 1881 | ||
| 1883 | dev->IMR_cache = 0; | 1882 | dev->IMR_cache = 0; |
| 1884 | 1883 | ||
| 1885 | err = request_irq(pci_dev->irq, ns83820_irq, SA_SHIRQ, | 1884 | err = request_irq(pci_dev->irq, ns83820_irq, IRQF_SHARED, |
| 1886 | DRV_NAME, ndev); | 1885 | DRV_NAME, ndev); |
| 1887 | if (err) { | 1886 | if (err) { |
| 1888 | printk(KERN_INFO "ns83820: unable to register irq %d\n", | 1887 | printk(KERN_INFO "ns83820: unable to register irq %d\n", |