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/i2c | |
| parent | b7e2ac619465f1774b827d9997109ceef4a61851 (diff) | |
| parent | 61ce5393e4c8914c46ec99cbda76823515109709 (diff) | |
Merge branch 'sh/clkfwk'
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-sh7760.c | 2 |
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) | |||
| 396 | signed char cdf, cdfm; | 396 | signed char cdf, cdfm; |
| 397 | int scgd, scgdm, scgds; | 397 | int scgd, scgdm, scgds; |
| 398 | 398 | ||
| 399 | mclk = clk_get(NULL, "module_clk"); | 399 | mclk = clk_get(NULL, "peripheral_clk"); |
| 400 | if (IS_ERR(mclk)) { | 400 | if (IS_ERR(mclk)) { |
| 401 | return PTR_ERR(mclk); | 401 | return PTR_ERR(mclk); |
| 402 | } else { | 402 | } else { |