diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 00:58:59 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 00:58:59 -0500 |
| commit | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (patch) | |
| tree | 73cd85e5529a01fa2338ab6d58b99c36dd666cbe /drivers/serial/imx.c | |
| parent | ddef9bb367b19383df627e388cb4c01c86ddba6c (diff) | |
| parent | 0bdd340c092b0936f78a54bdbd3927463ed4fca3 (diff) | |
Merge branch 'master'
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, |