diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-16 16:27:28 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-02 09:35:29 +0100 |
| commit | 39c0cb02db5b8fdfac76d506b7a008b70bc960e9 (patch) | |
| tree | 30e79dcadb5f6c26bba5fcf585cc309e240ff948 /arch/arm/mach-versatile/clock.c | |
| parent | b830b9b5b3d04bc22f0b9ded85b713f7d3c11b7f (diff) | |
| download | talos-op-linux-39c0cb02db5b8fdfac76d506b7a008b70bc960e9.tar.gz talos-op-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-versatile/clock.c')
| -rw-r--r-- | arch/arm/mach-versatile/clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-versatile/clock.c b/arch/arm/mach-versatile/clock.c index c50a44ea7ee6..530e16aa7ad6 100644 --- a/arch/arm/mach-versatile/clock.c +++ b/arch/arm/mach-versatile/clock.c @@ -42,7 +42,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; } @@ -53,7 +53,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; |
