diff options
-rw-r--r-- | arch/arm/mach-omap2/board-zoom-debugboard.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/serial.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c index bac5c4321ff7..f546063775b3 100644 --- a/arch/arm/mach-omap2/board-zoom-debugboard.c +++ b/arch/arm/mach-omap2/board-zoom-debugboard.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/gpio.h> | 12 | #include <linux/gpio.h> |
13 | #include <linux/serial_8250.h> | 13 | #include <linux/serial_8250.h> |
14 | #include <linux/smsc911x.h> | 14 | #include <linux/smsc911x.h> |
15 | #include <linux/interrupt.h> | ||
15 | 16 | ||
16 | #include <mach/gpmc.h> | 17 | #include <mach/gpmc.h> |
17 | 18 | ||
@@ -84,6 +85,7 @@ static struct plat_serial8250_port serial_platform_data[] = { | |||
84 | .mapbase = 0x10000000, | 85 | .mapbase = 0x10000000, |
85 | .irq = OMAP_GPIO_IRQ(102), | 86 | .irq = OMAP_GPIO_IRQ(102), |
86 | .flags = UPF_BOOT_AUTOCONF|UPF_IOREMAP|UPF_SHARE_IRQ, | 87 | .flags = UPF_BOOT_AUTOCONF|UPF_IOREMAP|UPF_SHARE_IRQ, |
88 | .irqflags = IRQF_SHARED | IRQF_TRIGGER_RISING, | ||
87 | .iotype = UPIO_MEM, | 89 | .iotype = UPIO_MEM, |
88 | .regshift = 1, | 90 | .regshift = 1, |
89 | .uartclk = QUART_CLK, | 91 | .uartclk = QUART_CLK, |
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 409b03309af4..dd3c735b5588 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c | |||
@@ -460,7 +460,7 @@ static void omap_uart_idle_init(struct omap_uart_state *uart) | |||
460 | uart->padconf = 0; | 460 | uart->padconf = 0; |
461 | } | 461 | } |
462 | 462 | ||
463 | p->flags |= UPF_SHARE_IRQ; | 463 | p->irqflags |= IRQF_SHARED; |
464 | ret = request_irq(p->irq, omap_uart_interrupt, IRQF_SHARED, | 464 | ret = request_irq(p->irq, omap_uart_interrupt, IRQF_SHARED, |
465 | "serial idle", (void *)uart); | 465 | "serial idle", (void *)uart); |
466 | WARN_ON(ret); | 466 | WARN_ON(ret); |