diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-04-01 09:28:32 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-04-01 09:28:32 (GMT) |
| commit | ffa37fc98d71ef930bccd4e9eed37f6ce6b4d6af (patch) | |
| tree | 206908754219b5cc6e9f03518d34fb95a247bef9 /drivers/serial | |
| parent | ca6e1c136ddb720c3bb2cc043b99f7f06bc46c55 (diff) | |
| parent | fd03ea89641d6f6ade6d1a8580c1bb9f52b8542c (diff) | |
| download | u-boot-fsl-qoriq-ffa37fc98d71ef930bccd4e9eed37f6ce6b4d6af.tar.xz | |
Merge branch '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; |