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/serial.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/serial.c')
| -rw-r--r-- | arch/arm/mach-omap1/serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c index 5615fb8a3d5b..976edfb882e2 100644 --- a/arch/arm/mach-omap1/serial.c +++ b/arch/arm/mach-omap1/serial.c | |||
| @@ -253,7 +253,7 @@ static void __init omap_serial_set_port_wakeup(int gpio_nr) | |||
| 253 | } | 253 | } |
| 254 | omap_set_gpio_direction(gpio_nr, 1); | 254 | omap_set_gpio_direction(gpio_nr, 1); |
| 255 | ret = request_irq(OMAP_GPIO_IRQ(gpio_nr), &omap_serial_wake_interrupt, | 255 | ret = request_irq(OMAP_GPIO_IRQ(gpio_nr), &omap_serial_wake_interrupt, |
| 256 | SA_TRIGGER_RISING, "serial wakeup", NULL); | 256 | IRQF_TRIGGER_RISING, "serial wakeup", NULL); |
| 257 | if (ret) { | 257 | if (ret) { |
| 258 | omap_free_gpio(gpio_nr); | 258 | omap_free_gpio(gpio_nr); |
| 259 | printk(KERN_ERR "No interrupt for UART wake GPIO: %i\n", | 259 | printk(KERN_ERR "No interrupt for UART wake GPIO: %i\n", |