diff options
Diffstat (limited to 'drivers/tty/serial')
-rw-r--r-- | drivers/tty/serial/sh-sci.c | 5 | ||||
-rw-r--r-- | drivers/tty/serial/uartlite.c | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index d4d8c9453cd8..9be296cf7295 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c | |||
@@ -25,6 +25,7 @@ | |||
25 | 25 | ||
26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
27 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
28 | #include <linux/sh_dma.h> | ||
28 | #include <linux/timer.h> | 29 | #include <linux/timer.h> |
29 | #include <linux/interrupt.h> | 30 | #include <linux/interrupt.h> |
30 | #include <linux/tty.h> | 31 | #include <linux/tty.h> |
@@ -1410,8 +1411,8 @@ static void work_fn_rx(struct work_struct *work) | |||
1410 | /* Handle incomplete DMA receive */ | 1411 | /* Handle incomplete DMA receive */ |
1411 | struct tty_struct *tty = port->state->port.tty; | 1412 | struct tty_struct *tty = port->state->port.tty; |
1412 | struct dma_chan *chan = s->chan_rx; | 1413 | struct dma_chan *chan = s->chan_rx; |
1413 | struct sh_desc *sh_desc = container_of(desc, struct sh_desc, | 1414 | struct shdma_desc *sh_desc = container_of(desc, |
1414 | async_tx); | 1415 | struct shdma_desc, async_tx); |
1415 | unsigned long flags; | 1416 | unsigned long flags; |
1416 | int count; | 1417 | int count; |
1417 | 1418 | ||
diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c index 6cd414341d5e..6579ffdd8e9b 100644 --- a/drivers/tty/serial/uartlite.c +++ b/drivers/tty/serial/uartlite.c | |||
@@ -216,8 +216,7 @@ static int ulite_startup(struct uart_port *port) | |||
216 | { | 216 | { |
217 | int ret; | 217 | int ret; |
218 | 218 | ||
219 | ret = request_irq(port->irq, ulite_isr, | 219 | ret = request_irq(port->irq, ulite_isr, IRQF_SHARED, "uartlite", port); |
220 | IRQF_SHARED | IRQF_SAMPLE_RANDOM, "uartlite", port); | ||
221 | if (ret) | 220 | if (ret) |
222 | return ret; | 221 | return ret; |
223 | 222 | ||