diff options
Diffstat (limited to 'drivers/tty/serial/s5pv210.c')
-rw-r--r-- | drivers/tty/serial/s5pv210.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/tty/serial/s5pv210.c b/drivers/tty/serial/s5pv210.c index dce6cb3dbad1..8b0b888a1b76 100644 --- a/drivers/tty/serial/s5pv210.c +++ b/drivers/tty/serial/s5pv210.c | |||
@@ -31,7 +31,7 @@ static int s5pv210_serial_setsource(struct uart_port *port, | |||
31 | struct s3c2410_uartcfg *cfg = port->dev->platform_data; | 31 | struct s3c2410_uartcfg *cfg = port->dev->platform_data; |
32 | unsigned long ucon = rd_regl(port, S3C2410_UCON); | 32 | unsigned long ucon = rd_regl(port, S3C2410_UCON); |
33 | 33 | ||
34 | if ((cfg->clocks_size) == 1) | 34 | if (cfg->flags & NO_NEED_CHECK_CLKSRC) |
35 | return 0; | 35 | return 0; |
36 | 36 | ||
37 | if (strcmp(clk->name, "pclk") == 0) | 37 | if (strcmp(clk->name, "pclk") == 0) |
@@ -56,7 +56,7 @@ static int s5pv210_serial_getsource(struct uart_port *port, | |||
56 | 56 | ||
57 | clk->divisor = 1; | 57 | clk->divisor = 1; |
58 | 58 | ||
59 | if ((cfg->clocks_size) == 1) | 59 | if (cfg->flags & NO_NEED_CHECK_CLKSRC) |
60 | return 0; | 60 | return 0; |
61 | 61 | ||
62 | switch (ucon & S5PV210_UCON_CLKMASK) { | 62 | switch (ucon & S5PV210_UCON_CLKMASK) { |
@@ -139,13 +139,6 @@ static struct platform_driver s5p_serial_driver = { | |||
139 | }, | 139 | }, |
140 | }; | 140 | }; |
141 | 141 | ||
142 | static int __init s5pv210_serial_console_init(void) | ||
143 | { | ||
144 | return s3c24xx_serial_initconsole(&s5p_serial_driver, s5p_uart_inf); | ||
145 | } | ||
146 | |||
147 | console_initcall(s5pv210_serial_console_init); | ||
148 | |||
149 | static int __init s5p_serial_init(void) | 142 | static int __init s5p_serial_init(void) |
150 | { | 143 | { |
151 | return s3c24xx_serial_init(&s5p_serial_driver, *s5p_uart_inf); | 144 | return s3c24xx_serial_init(&s5p_serial_driver, *s5p_uart_inf); |