diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /drivers/net/netxen | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/net/netxen')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index c2da7ec0248a..225ff55527c4 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
| @@ -620,8 +620,8 @@ static int netxen_nic_open(struct net_device *netdev) | |||
| 620 | } | 620 | } |
| 621 | adapter->irq = adapter->ahw.pdev->irq; | 621 | adapter->irq = adapter->ahw.pdev->irq; |
| 622 | err = request_irq(adapter->ahw.pdev->irq, &netxen_intr, | 622 | err = request_irq(adapter->ahw.pdev->irq, &netxen_intr, |
| 623 | SA_SHIRQ | SA_SAMPLE_RANDOM, netdev->name, | 623 | IRQF_SHARED | IRQF_SAMPLE_RANDOM, |
| 624 | adapter); | 624 | netdev->name, adapter); |
| 625 | if (err) { | 625 | if (err) { |
| 626 | printk(KERN_ERR "request_irq failed with: %d\n", err); | 626 | printk(KERN_ERR "request_irq failed with: %d\n", err); |
| 627 | netxen_free_hw_resources(adapter); | 627 | netxen_free_hw_resources(adapter); |