diff options
| author |   Grant Likely <grant.likely@secretlab.ca> | 2011-07-15 20:11:34 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-07-15 20:11:34 -0600 |
| commit | 8c11642a50555e584774737f7c296f9aece310cf (patch) | |
| tree | 1ff8dfaf05479593ef2c50378a68dfc6aec495a5 /drivers/tty/serial/s5pv210.c | |
| parent | dt: remove extra xsysace platform_driver registration (diff) | |
| parent | Linux 3.0-rc7 (diff) | |
| download | linux-dev-8c11642a50555e584774737f7c296f9aece310cf.tar.xz linux-dev-8c11642a50555e584774737f7c296f9aece310cf.zip | |
Merge commit 'v3.0-rc7' into devicetree/next
Diffstat (limited to 'drivers/tty/serial/s5pv210.c')
| -rw-r--r-- | drivers/tty/serial/s5pv210.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/s5pv210.c b/drivers/tty/serial/s5pv210.c index fb2619f93d84..dd194dc80ee9 100644 --- a/drivers/tty/serial/s5pv210.c +++ b/drivers/tty/serial/s5pv210.c @@ -30,7 +30,7 @@ static int s5pv210_serial_setsource(struct uart_port *port, struct s3c2410_uartcfg *cfg = port->dev->platform_data; unsigned long ucon = rd_regl(port, S3C2410_UCON); - if ((cfg->clocks_size) == 1) + if (cfg->flags & NO_NEED_CHECK_CLKSRC) return 0; if (strcmp(clk->name, "pclk") == 0) @@ -55,7 +55,7 @@ static int s5pv210_serial_getsource(struct uart_port *port, clk->divisor = 1; - if ((cfg->clocks_size) == 1) + if (cfg->flags & NO_NEED_CHECK_CLKSRC) return 0; switch (ucon & S5PV210_UCON_CLKMASK) { |