diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-05-26 16:50:40 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-05-26 16:50:40 +0200 |
commit | 464c9e10376b24f04402fa8ef72b66257561bffa (patch) | |
tree | ac95ad416a2d3f3afcc92ca1790267a03b2be10d /drivers/serial | |
parent | sh: pci: Disable MWI and make pci_dma_burst_advice() a bit more accurate. (diff) | |
parent | sh: remove clk_ops->build_rate_table() (diff) | |
download | linux-464c9e10376b24f04402fa8ef72b66257561bffa.tar.xz linux-464c9e10376b24f04402fa8ef72b66257561bffa.zip |
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, sci_port->port.uartclk = CONFIG_CPU_CLOCK; #elif defined(CONFIG_HAVE_CLK) sci_port->iclk = p->clk ? clk_get(&dev->dev, p->clk) : NULL; - sci_port->dclk = clk_get(&dev->dev, "module_clk"); + sci_port->dclk = clk_get(&dev->dev, "peripheral_clk"); sci_port->enable = sci_clk_enable; sci_port->disable = sci_clk_disable; #else |