summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorPaul Mundt2009-05-26 16:50:40 +0200
committerPaul Mundt2009-05-26 16:50:40 +0200
commit464c9e10376b24f04402fa8ef72b66257561bffa (patch)
treeac95ad416a2d3f3afcc92ca1790267a03b2be10d /drivers/i2c
parentsh: pci: Disable MWI and make pci_dma_burst_advice() a bit more accurate. (diff)
parentsh: remove clk_ops->build_rate_table() (diff)
downloadkernel-qcow2-linux-464c9e10376b24f04402fa8ef72b66257561bffa.tar.gz
kernel-qcow2-linux-464c9e10376b24f04402fa8ef72b66257561bffa.tar.xz
kernel-qcow2-linux-464c9e10376b24f04402fa8ef72b66257561bffa.zip
Merge branch 'sh/clkfwk'
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-sh7760.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-sh7760.c b/drivers/i2c/busses/i2c-sh7760.c
index baa28b73ae42..b9680f50f541 100644
--- a/drivers/i2c/busses/i2c-sh7760.c
+++ b/drivers/i2c/busses/i2c-sh7760.c
@@ -396,7 +396,7 @@ static int __devinit calc_CCR(unsigned long scl_hz)
signed char cdf, cdfm;
int scgd, scgdm, scgds;
- mclk = clk_get(NULL, "module_clk");
+ mclk = clk_get(NULL, "peripheral_clk");
if (IS_ERR(mclk)) {
return PTR_ERR(mclk);
} else {