diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-03-28 00:04:18 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-03-28 00:04:18 +0100 |
| commit | be1a91320ce0cb7330bb650d1576bb56c55092af (patch) | |
| tree | f6bb6d34565d4f5b3386a23885fb3df6c17e0456 /drivers/serial | |
| parent | 6b94b4962211c16ee2197048faa887e1f92f3757 (diff) | |
| parent | 9d3a86aec52cb3c0e9badd12167d9292184ce4dd (diff) | |
| download | u-boot-imx-be1a91320ce0cb7330bb650d1576bb56c55092af.zip u-boot-imx-be1a91320ce0cb7330bb650d1576bb56c55092af.tar.gz u-boot-imx-be1a91320ce0cb7330bb650d1576bb56c55092af.tar.bz2 | |
Merge branch 'next' of git://git.denx.de/u-boot-coldfire into next
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/mcfuart.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/mcfuart.c b/drivers/serial/mcfuart.c index 0b53140..d93b24b 100644 --- a/drivers/serial/mcfuart.c +++ b/drivers/serial/mcfuart.c @@ -34,7 +34,7 @@ DECLARE_GLOBAL_DATA_PTR; -extern void uart_port_conf(void); +extern void uart_port_conf(int port); int serial_init(void) { @@ -43,7 +43,7 @@ int serial_init(void) uart = (volatile uart_t *)(CONFIG_SYS_UART_BASE); - uart_port_conf(); + uart_port_conf(CONFIG_SYS_UART_PORT); /* write to SICR: SIM2 = uart mode,dcd does not affect rx */ uart->ucr = UART_UCR_RESET_RX; |