diff options
| author | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 23:24:23 +0200 |
|---|---|---|
| committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 23:24:23 +0200 |
| commit | 05668381140309088443bf5dc53add4104610fbb (patch) | |
| tree | ed53039717390e1a71ff16209281b1f1c8d3e6be /arch/arm/mach-omap1/serial.c | |
| parent | 34c162f79e374556dd1384437f0dab558b5dc657 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
| download | kernel_samsung_smdk4412-05668381140309088443bf5dc53add4104610fbb.zip kernel_samsung_smdk4412-05668381140309088443bf5dc53add4104610fbb.tar.gz kernel_samsung_smdk4412-05668381140309088443bf5dc53add4104610fbb.tar.bz2 | |
Merge branch 'master' of /home/sam/kernel/linux-2.6/
Diffstat (limited to 'arch/arm/mach-omap1/serial.c')
| -rw-r--r-- | arch/arm/mach-omap1/serial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c index 9b4cd69..976edfb 100644 --- a/arch/arm/mach-omap1/serial.c +++ b/arch/arm/mach-omap1/serial.c @@ -8,10 +8,10 @@ * published by the Free Software Foundation. */ -#include <linux/config.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> +#include <linux/irq.h> #include <linux/delay.h> #include <linux/serial.h> #include <linux/tty.h> @@ -253,7 +253,7 @@ static void __init omap_serial_set_port_wakeup(int gpio_nr) } omap_set_gpio_direction(gpio_nr, 1); ret = request_irq(OMAP_GPIO_IRQ(gpio_nr), &omap_serial_wake_interrupt, - SA_TRIGGER_RISING, "serial wakeup", NULL); + IRQF_TRIGGER_RISING, "serial wakeup", NULL); if (ret) { omap_free_gpio(gpio_nr); printk(KERN_ERR "No interrupt for UART wake GPIO: %i\n", |