diff options
| author | Kalle Pokki <kalle.pokki@iki.fi> | 2006-11-01 15:08:13 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-11-10 21:35:36 +1100 |
| commit | 0091cf5a6ae6e52fc95ceb53200975ef2c81c206 (patch) | |
| tree | 374a45649cff6bf799541bbfc602097c843f5b36 /drivers/serial/cpm_uart/cpm_uart_cpm1.c | |
| parent | 599540a85595bd5950354bd95f5ebf9c6e07c971 (diff) | |
[POWERPC] CPM_UART: Fix non-console initialisation
The cpm_uart driver is initialised incorrectly, if there is a frame buffer
console, and CONFIG_SERIAL_CPM_CONSOLE is defined. The driver fails to
call cpm_uart_init_portdesc() and set_lineif() in this case.
Signed-off-by: Kalle Pokki <kalle.pokki@iki.fi>
Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/serial/cpm_uart/cpm_uart_cpm1.c')
| -rw-r--r-- | drivers/serial/cpm_uart/cpm_uart_cpm1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/serial/cpm_uart/cpm_uart_cpm1.c index 95afc37297a..08e55fdc882 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c +++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.c @@ -184,7 +184,7 @@ void cpm_uart_freebuf(struct uart_cpm_port *pinfo) } /* Setup any dynamic params in the uart desc */ -int cpm_uart_init_portdesc(void) +int __init cpm_uart_init_portdesc(void) { pr_debug("CPM uart[-]:init portdesc\n"); |