diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 18:21:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 18:21:22 -0500 |
| commit | 17be03f0a1f42ccfccb38f7d0a94c0f0169634a6 (patch) | |
| tree | 8fe4fc7a987547c546e7b493eecb3607a9583795 /drivers/serial/imx.c | |
| parent | cce0cac125623f9b68f25dd1350f6d616220a8dd (diff) | |
| parent | 85d1494e5ff8e20a52ce514584ffda4f0265025e (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
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 858048efe1ed..4d53fb5ca87b 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c | |||
| @@ -668,7 +668,7 @@ static struct imx_port imx_ports[] = { | |||
| 668 | .rtsirq = UART1_MINT_RTS, | 668 | .rtsirq = UART1_MINT_RTS, |
| 669 | .port = { | 669 | .port = { |
| 670 | .type = PORT_IMX, | 670 | .type = PORT_IMX, |
| 671 | .iotype = SERIAL_IO_MEM, | 671 | .iotype = UPIO_MEM, |
| 672 | .membase = (void *)IMX_UART1_BASE, | 672 | .membase = (void *)IMX_UART1_BASE, |
| 673 | .mapbase = IMX_UART1_BASE, /* FIXME */ | 673 | .mapbase = IMX_UART1_BASE, /* FIXME */ |
| 674 | .irq = UART1_MINT_RX, | 674 | .irq = UART1_MINT_RX, |
| @@ -684,7 +684,7 @@ static struct imx_port imx_ports[] = { | |||
| 684 | .rtsirq = UART2_MINT_RTS, | 684 | .rtsirq = UART2_MINT_RTS, |
| 685 | .port = { | 685 | .port = { |
| 686 | .type = PORT_IMX, | 686 | .type = PORT_IMX, |
| 687 | .iotype = SERIAL_IO_MEM, | 687 | .iotype = UPIO_MEM, |
| 688 | .membase = (void *)IMX_UART2_BASE, | 688 | .membase = (void *)IMX_UART2_BASE, |
| 689 | .mapbase = IMX_UART2_BASE, /* FIXME */ | 689 | .mapbase = IMX_UART2_BASE, /* FIXME */ |
| 690 | .irq = UART2_MINT_RX, | 690 | .irq = UART2_MINT_RX, |