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/video/intelfb/intelfbhw.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/video/intelfb/intelfbhw.c')
-rw-r--r-- | drivers/video/intelfb/intelfbhw.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c index a95836839e1e..c1eb18bf0883 100644 --- a/drivers/video/intelfb/intelfbhw.c +++ b/drivers/video/intelfb/intelfbhw.c | |||
@@ -1990,7 +1990,8 @@ int | |||
1990 | intelfbhw_enable_irq(struct intelfb_info *dinfo, int reenable) { | 1990 | intelfbhw_enable_irq(struct intelfb_info *dinfo, int reenable) { |
1991 | 1991 | ||
1992 | if (!test_and_set_bit(0, &dinfo->irq_flags)) { | 1992 | if (!test_and_set_bit(0, &dinfo->irq_flags)) { |
1993 | if (request_irq(dinfo->pdev->irq, intelfbhw_irq, SA_SHIRQ, "intelfb", dinfo)) { | 1993 | if (request_irq(dinfo->pdev->irq, intelfbhw_irq, IRQF_SHARED, |
1994 | "intelfb", dinfo)) { | ||
1994 | clear_bit(0, &dinfo->irq_flags); | 1995 | clear_bit(0, &dinfo->irq_flags); |
1995 | return -EINVAL; | 1996 | return -EINVAL; |
1996 | } | 1997 | } |