diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-12 20:31:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-12 20:31:36 -0400 |
| commit | 7258ea8acd2252d5a68e7dfa2eac8dc8f364b91e (patch) | |
| tree | a13594ddbd91b27c8afa49c1a2c6b4dc8141ae11 /drivers | |
| parent | af84b99f22df115e7aec41d5dbe936e163ef4e2e (diff) | |
| parent | 1bb99a649af92e53ed7391afaf6c2d45a6f57b42 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
sh64: Add a sane pm_power_off implementation.
sh64: Use generic BUG_ON()/WARN_ON().
sh64: Trivial build fixes.
sh64: Drop deprecated ISA tuning for legacy toolchains.
Diffstat (limited to 'drivers')
| -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 301573373c3..cbede06cac2 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) | |||
| 1579 | h8300_sci_enable(port, sci_enable); | 1579 | h8300_sci_enable(port, sci_enable); |
| 1580 | #endif | 1580 | #endif |
| 1581 | #elif defined(CONFIG_SUPERH64) | 1581 | #elif defined(CONFIG_SUPERH64) |
| 1582 | port->uartclk = current_cpu_info.module_clock * 16; | 1582 | port->uartclk = current_cpu_data.module_clock * 16; |
| 1583 | #else | 1583 | #else |
| 1584 | { | 1584 | { |
| 1585 | struct clk *clk = clk_get("module_clk"); | 1585 | struct clk *clk = clk_get("module_clk"); |
| @@ -1720,7 +1720,7 @@ static int __init sci_init(void) | |||
| 1720 | #if defined(__H8300H__) || defined(__H8300S__) | 1720 | #if defined(__H8300H__) || defined(__H8300S__) |
| 1721 | sciport->port.uartclk = CONFIG_CPU_CLOCK; | 1721 | sciport->port.uartclk = CONFIG_CPU_CLOCK; |
| 1722 | #elif defined(CONFIG_SUPERH64) | 1722 | #elif defined(CONFIG_SUPERH64) |
| 1723 | sciport->port.uartclk = current_cpu_info.module_clock * 16; | 1723 | sciport->port.uartclk = current_cpu_data.module_clock * 16; |
| 1724 | #else | 1724 | #else |
| 1725 | struct clk *clk = clk_get("module_clk"); | 1725 | struct clk *clk = clk_get("module_clk"); |
| 1726 | sciport->port.uartclk = clk_get_rate(clk) * 16; | 1726 | sciport->port.uartclk = clk_get_rate(clk) * 16; |