diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-05-26 10:50:40 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-05-26 10:50:40 -0400 |
| commit | 464c9e10376b24f04402fa8ef72b66257561bffa (patch) | |
| tree | ac95ad416a2d3f3afcc92ca1790267a03b2be10d /drivers/serial | |
| parent | b7e2ac619465f1774b827d9997109ceef4a61851 (diff) | |
| parent | 61ce5393e4c8914c46ec99cbda76823515109709 (diff) | |
Merge branch 'sh/clkfwk'
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/sh-sci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index 4e3248d58602..fa4d52a6c032 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c | |||
| @@ -1084,7 +1084,7 @@ static void __devinit sci_init_single(struct platform_device *dev, | |||
| 1084 | sci_port->port.uartclk = CONFIG_CPU_CLOCK; | 1084 | sci_port->port.uartclk = CONFIG_CPU_CLOCK; |
| 1085 | #elif defined(CONFIG_HAVE_CLK) | 1085 | #elif defined(CONFIG_HAVE_CLK) |
| 1086 | sci_port->iclk = p->clk ? clk_get(&dev->dev, p->clk) : NULL; | 1086 | sci_port->iclk = p->clk ? clk_get(&dev->dev, p->clk) : NULL; |
| 1087 | sci_port->dclk = clk_get(&dev->dev, "module_clk"); | 1087 | sci_port->dclk = clk_get(&dev->dev, "peripheral_clk"); |
| 1088 | sci_port->enable = sci_clk_enable; | 1088 | sci_port->enable = sci_clk_enable; |
| 1089 | sci_port->disable = sci_clk_disable; | 1089 | sci_port->disable = sci_clk_disable; |
| 1090 | #else | 1090 | #else |