diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-02-14 03:33:16 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 11:09:54 -0500 |
commit | 38515e908ba3a9c467ad3bf347b9bce69216df94 (patch) | |
tree | 3bb0287ad4ea18d61cb3cad74337343ef5034b5d /drivers/net/netxen | |
parent | 3159f06dc2303630c02d1ad2eeaeaf341414c9df (diff) |
[PATCH] Scheduled removal of SA_xxx interrupt flags fixups
The obsolete SA_xxx interrupt flags have been used despite the scheduled
removal. Fixup the remaining users.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Ingo Molnar <mingo@elte.hu>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: Roland Dreier <rolandd@cisco.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Greg KH <greg@kroah.com>
Cc: Dave Airlie <airlied@linux.ie>
Cc: James Simmons <jsimmons@infradead.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
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 69c1b9d23a1a..36ba6a1aa363 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
@@ -619,8 +619,8 @@ static int netxen_nic_open(struct net_device *netdev) | |||
619 | } | 619 | } |
620 | adapter->irq = adapter->ahw.pdev->irq; | 620 | adapter->irq = adapter->ahw.pdev->irq; |
621 | err = request_irq(adapter->ahw.pdev->irq, &netxen_intr, | 621 | err = request_irq(adapter->ahw.pdev->irq, &netxen_intr, |
622 | SA_SHIRQ | SA_SAMPLE_RANDOM, netdev->name, | 622 | IRQF_SHARED | IRQF_SAMPLE_RANDOM, |
623 | adapter); | 623 | netdev->name, adapter); |
624 | if (err) { | 624 | if (err) { |
625 | printk(KERN_ERR "request_irq failed with: %d\n", err); | 625 | printk(KERN_ERR "request_irq failed with: %d\n", err); |
626 | netxen_free_hw_resources(adapter); | 626 | netxen_free_hw_resources(adapter); |