diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-02 20:20:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 20:29:22 -0400 |
commit | 52e405eaa9806968e88b35d65e57acad954a5ab5 (patch) | |
tree | b42e2d50c4f9d1b00baf5a8b54309ffdf1950456 /arch/arm/mach-omap1/board-osk.c | |
parent | d061daa0e3abdddc28e21a37c8ac4536dedbf239 (diff) |
[PATCH] ARM: fixup irqflags breakage after ARM genirq merge
The irgflags consolidation did conflict with the ARM to generic IRQ
conversion and was not applied for ARM. Fix it up.
Use the new IRQF_ constants and remove the SA_INTERRUPT define
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/arm/mach-omap1/board-osk.c')
-rw-r--r-- | arch/arm/mach-omap1/board-osk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index 91933301bb73..b742261c97ad 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c | |||
@@ -357,7 +357,7 @@ static void __init osk_mistral_init(void) | |||
357 | */ | 357 | */ |
358 | ret = request_irq(OMAP_GPIO_IRQ(OMAP_MPUIO(2)), | 358 | ret = request_irq(OMAP_GPIO_IRQ(OMAP_MPUIO(2)), |
359 | &osk_mistral_wake_interrupt, | 359 | &osk_mistral_wake_interrupt, |
360 | SA_SHIRQ, "mistral_wakeup", | 360 | IRQF_SHARED, "mistral_wakeup", |
361 | &osk_mistral_wake_interrupt); | 361 | &osk_mistral_wake_interrupt); |
362 | if (ret != 0) { | 362 | if (ret != 0) { |
363 | omap_free_gpio(OMAP_MPUIO(2)); | 363 | omap_free_gpio(OMAP_MPUIO(2)); |