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/qla3xxx.c | |
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/qla3xxx.c')
-rwxr-xr-x | drivers/net/qla3xxx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c index 2429b274f0b0..a142cdfd947b 100755 --- a/drivers/net/qla3xxx.c +++ b/drivers/net/qla3xxx.c | |||
@@ -3228,7 +3228,7 @@ static int ql_adapter_up(struct ql3_adapter *qdev) | |||
3228 | { | 3228 | { |
3229 | struct net_device *ndev = qdev->ndev; | 3229 | struct net_device *ndev = qdev->ndev; |
3230 | int err; | 3230 | int err; |
3231 | unsigned long irq_flags = SA_SAMPLE_RANDOM | SA_SHIRQ; | 3231 | unsigned long irq_flags = IRQF_SAMPLE_RANDOM | IRQF_SHARED; |
3232 | unsigned long hw_flags; | 3232 | unsigned long hw_flags; |
3233 | 3233 | ||
3234 | if (ql_alloc_mem_resources(qdev)) { | 3234 | if (ql_alloc_mem_resources(qdev)) { |
@@ -3247,7 +3247,7 @@ static int ql_adapter_up(struct ql3_adapter *qdev) | |||
3247 | } else { | 3247 | } else { |
3248 | printk(KERN_INFO PFX "%s: MSI Enabled...\n", qdev->ndev->name); | 3248 | printk(KERN_INFO PFX "%s: MSI Enabled...\n", qdev->ndev->name); |
3249 | set_bit(QL_MSI_ENABLED,&qdev->flags); | 3249 | set_bit(QL_MSI_ENABLED,&qdev->flags); |
3250 | irq_flags &= ~SA_SHIRQ; | 3250 | irq_flags &= ~IRQF_SHARED; |
3251 | } | 3251 | } |
3252 | } | 3252 | } |
3253 | 3253 | ||