diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 11:31:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 11:31:02 -0800 |
| commit | bb4bc81a234c66e8d8a4475110fa2d7988a34671 (patch) | |
| tree | dd97395a565e8e6fc05f58bb0d3cba8f300d114d /drivers/serial | |
| parent | adac1665234dd966990af846eccd20b7f4923279 (diff) | |
| parent | 14e54cc391e22bd564993583464577e4e34a2701 (diff) | |
| download | linux-bb4bc81a234c66e8d8a4475110fa2d7988a34671.tar.gz | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/imx.c | 4 | ||||
| -rw-r--r-- | drivers/serial/s3c2410.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index 587cc6a951146..fa3bbd6c751ff 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c @@ -402,10 +402,10 @@ static int imx_startup(struct uart_port *port) DRIVER_NAME, sport); if (retval) goto error_out2; - retval = request_irq(sport->rtsirq, imx_rtsint, 0, + retval = request_irq(sport->rtsirq, imx_rtsint, + SA_TRIGGER_FALLING | SA_TRIGGER_RISING, DRIVER_NAME, sport); if (retval) goto error_out3; - set_irq_type(sport->rtsirq, IRQT_BOTHEDGE); /* * Finally, clear and enable interrupts diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c index eb4883efb7c65..0a2dd6c5b95fd 100644 --- a/drivers/serial/s3c2410.c +++ b/drivers/serial/s3c2410.c @@ -1060,7 +1060,7 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport, dbg("resource %p (%lx..%lx)\n", res, res->start, res->end); port->mapbase = res->start; - port->membase = S3C24XX_VA_UART + (res->start - S3C2410_PA_UART); + port->membase = S3C24XX_VA_UART + (res->start - S3C24XX_PA_UART); port->irq = platform_get_irq(platdev, 0); ourport->clk = clk_get(&platdev->dev, "uart"); |