diff options
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/cpm_uart/cpm_uart_core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c index 4dd00bea191a..f8df0681e160 100644 --- a/drivers/serial/cpm_uart/cpm_uart_core.c +++ b/drivers/serial/cpm_uart/cpm_uart_core.c | |||
@@ -1106,6 +1106,10 @@ static int cpm_uart_init_port(struct device_node *np, | |||
1106 | for (i = 0; i < NUM_GPIOS; i++) | 1106 | for (i = 0; i < NUM_GPIOS; i++) |
1107 | pinfo->gpios[i] = of_get_gpio(np, i); | 1107 | pinfo->gpios[i] = of_get_gpio(np, i); |
1108 | 1108 | ||
1109 | #ifdef CONFIG_PPC_EARLY_DEBUG_CPM | ||
1110 | udbg_putc = NULL; | ||
1111 | #endif | ||
1112 | |||
1109 | return cpm_uart_request_port(&pinfo->port); | 1113 | return cpm_uart_request_port(&pinfo->port); |
1110 | 1114 | ||
1111 | out_pram: | 1115 | out_pram: |
@@ -1255,10 +1259,6 @@ static int __init cpm_uart_console_setup(struct console *co, char *options) | |||
1255 | baud = 9600; | 1259 | baud = 9600; |
1256 | } | 1260 | } |
1257 | 1261 | ||
1258 | #ifdef CONFIG_PPC_EARLY_DEBUG_CPM | ||
1259 | udbg_putc = NULL; | ||
1260 | #endif | ||
1261 | |||
1262 | if (IS_SMC(pinfo)) { | 1262 | if (IS_SMC(pinfo)) { |
1263 | out_be16(&pinfo->smcup->smc_brkcr, 0); | 1263 | out_be16(&pinfo->smcup->smc_brkcr, 0); |
1264 | cpm_line_cr_cmd(pinfo, CPM_CR_STOP_TX); | 1264 | cpm_line_cr_cmd(pinfo, CPM_CR_STOP_TX); |