git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: ICST: merge common ICST VCO structures
[safe/jmp/linux-2.6]
/
arch
/
arm
/
mach-realview
/
clock.c
diff --git
a/arch/arm/mach-realview/clock.c
b/arch/arm/mach-realview/clock.c
index
a704311
..
8364657
100644
(file)
--- 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)
{
long clk_round_rate(struct clk *clk, unsigned long rate)
{
- struct icst
307
_vco vco;
+ struct icst_vco vco;
vco = icst307_khz_to_vco(clk->params, rate / 1000);
return icst307_khz(clk->params, vco) * 1000;
}
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) {
int ret = -EIO;
if (clk->setvco) {
- struct icst
307
_vco vco;
+ struct icst_vco vco;
vco = icst307_khz_to_vco(clk->params, rate / 1000);
clk->rate = icst307_khz(clk->params, vco) * 1000;
vco = icst307_khz_to_vco(clk->params, rate / 1000);
clk->rate = icst307_khz(clk->params, vco) * 1000;