diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 14:31:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 14:31:02 -0500 |
commit | bb4bc81a234c66e8d8a4475110fa2d7988a34671 (patch) | |
tree | dd97395a565e8e6fc05f58bb0d3cba8f300d114d /drivers/serial/imx.c | |
parent | adac1665234dd966990af846eccd20b7f4923279 (diff) | |
parent | 14e54cc391e22bd564993583464577e4e34a2701 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers/serial/imx.c')
-rw-r--r-- | drivers/serial/imx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index 587cc6a95114..fa3bbd6c751f 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c | |||
@@ -402,10 +402,10 @@ static int imx_startup(struct uart_port *port) | |||
402 | DRIVER_NAME, sport); | 402 | DRIVER_NAME, sport); |
403 | if (retval) goto error_out2; | 403 | if (retval) goto error_out2; |
404 | 404 | ||
405 | retval = request_irq(sport->rtsirq, imx_rtsint, 0, | 405 | retval = request_irq(sport->rtsirq, imx_rtsint, |
406 | SA_TRIGGER_FALLING | SA_TRIGGER_RISING, | ||
406 | DRIVER_NAME, sport); | 407 | DRIVER_NAME, sport); |
407 | if (retval) goto error_out3; | 408 | if (retval) goto error_out3; |
408 | set_irq_type(sport->rtsirq, IRQT_BOTHEDGE); | ||
409 | 409 | ||
410 | /* | 410 | /* |
411 | * Finally, clear and enable interrupts | 411 | * Finally, clear and enable interrupts |