git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
[pandora-kernel.git]
/
drivers
/
tty
/
serial
/
s5pv210.c
diff --git
a/drivers/tty/serial/s5pv210.c
b/drivers/tty/serial/s5pv210.c
index
6ebccd7
..
dd194dc
100644
(file)
--- a/
drivers/tty/serial/s5pv210.c
+++ b/
drivers/tty/serial/s5pv210.c
@@
-1,5
+1,4
@@
-/* linux/drivers/serial/s5pv210.c
- *
+/*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
*
@@
-31,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);
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)
return 0;
if (strcmp(clk->name, "pclk") == 0)
@@
-56,7
+55,7
@@
static int s5pv210_serial_getsource(struct uart_port *port,
clk->divisor = 1;
clk->divisor = 1;
- if (
(cfg->clocks_size) == 1
)
+ if (
cfg->flags & NO_NEED_CHECK_CLKSRC
)
return 0;
switch (ucon & S5PV210_UCON_CLKMASK) {
return 0;
switch (ucon & S5PV210_UCON_CLKMASK) {