diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-16 17:27:28 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-02 10:35:29 +0200 |
commit | 39c0cb02db5b8fdfac76d506b7a008b70bc960e9 (patch) | |
tree | 30e79dcadb5f6c26bba5fcf585cc309e240ff948 /arch/arm/mach-realview/clock.c | |
parent | ARM: Integrator: convert to use register definitions (diff) | |
download | linux-39c0cb02db5b8fdfac76d506b7a008b70bc960e9.tar.xz linux-39c0cb02db5b8fdfac76d506b7a008b70bc960e9.zip |
ARM: ICST: merge common ICST VCO structures
The structures for the ICST307 and ICST525 VCO devices are
identical, so merge them together.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-realview/clock.c')
-rw-r--r-- | arch/arm/mach-realview/clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-realview/clock.c b/arch/arm/mach-realview/clock.c index a7043115de72..83646579bc45 100644 --- a/arch/arm/mach-realview/clock.c +++ b/arch/arm/mach-realview/clock.c @@ -41,7 +41,7 @@ EXPORT_SYMBOL(clk_get_rate); long clk_round_rate(struct clk *clk, unsigned long rate) { - struct icst307_vco vco; + struct icst_vco vco; vco = icst307_khz_to_vco(clk->params, rate / 1000); return icst307_khz(clk->params, vco) * 1000; } @@ -52,7 +52,7 @@ int clk_set_rate(struct clk *clk, unsigned long rate) int ret = -EIO; if (clk->setvco) { - struct icst307_vco vco; + struct icst_vco vco; vco = icst307_khz_to_vco(clk->params, rate / 1000); clk->rate = icst307_khz(clk->params, vco) * 1000; |