diff options
author | Paul Mundt <lethal@linux-sh.org> | 2006-09-12 14:36:46 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2006-09-12 14:36:46 +0900 |
commit | 21264136ce7c3c7032c42e7c2440f5d89039ca5a (patch) | |
tree | 99f0552df91c45c41fba68caad7cff270b54beda /drivers/serial/sh-sci.c | |
parent | ccdfc526a92c5ebb549a7de06adca3fd54f03c7e (diff) | |
download | lwn-21264136ce7c3c7032c42e7c2440f5d89039ca5a.tar.gz lwn-21264136ce7c3c7032c42e7c2440f5d89039ca5a.zip |
sh64: Trivial build fixes.
While we've been sorting out the toolchain fiasco, some of
the code has suffered a bit of bitrot. Building with GCC4
also brings up some more build warnings. Trivial fixes for
both issues.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/serial/sh-sci.c')
-rw-r--r-- | drivers/serial/sh-sci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index 301573373c30..cbede06cac27 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c @@ -1579,7 +1579,7 @@ static int __init serial_console_setup(struct console *co, char *options) h8300_sci_enable(port, sci_enable); #endif #elif defined(CONFIG_SUPERH64) - port->uartclk = current_cpu_info.module_clock * 16; + port->uartclk = current_cpu_data.module_clock * 16; #else { struct clk *clk = clk_get("module_clk"); @@ -1720,7 +1720,7 @@ static int __init sci_init(void) #if defined(__H8300H__) || defined(__H8300S__) sciport->port.uartclk = CONFIG_CPU_CLOCK; #elif defined(CONFIG_SUPERH64) - sciport->port.uartclk = current_cpu_info.module_clock * 16; + sciport->port.uartclk = current_cpu_data.module_clock * 16; #else struct clk *clk = clk_get("module_clk"); sciport->port.uartclk = clk_get_rate(clk) * 16; |