diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-09-05 07:52:33 +0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-09-05 07:52:33 +0400 |
commit | f1e0477a7b7a541f51eea279910eed4ddd010033 (patch) | |
tree | 552841f13496306f0140d5faca82ae9987a81b5e /arch/arm/plat-s5p/clock.c | |
parent | b58c580d996655658975aa8042b43b7d579f3986 (diff) | |
parent | 9e79e3e9dd9672b37ac9412e9a926714306551fe (diff) | |
download | linux-f1e0477a7b7a541f51eea279910eed4ddd010033.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Diffstat (limited to 'arch/arm/plat-s5p/clock.c')
-rw-r--r-- | arch/arm/plat-s5p/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s5p/clock.c b/arch/arm/plat-s5p/clock.c index 02af235298e2..5f84a3f13ef9 100644 --- a/arch/arm/plat-s5p/clock.c +++ b/arch/arm/plat-s5p/clock.c @@ -192,7 +192,7 @@ unsigned long s5p_spdif_get_rate(struct clk *clk) if (IS_ERR(pclk)) return -EINVAL; - rate = pclk->ops->get_rate(clk); + rate = pclk->ops->get_rate(pclk); clk_put(pclk); return rate; |