diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-01-18 14:52:31 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-01-18 14:52:31 +0530 |
| commit | 754deb500cac53edcff2165ca4edb8c8be896d2c (patch) | |
| tree | 71356f7bf39e87b5d261ab69c159cb8a114831eb /arch/arm/mach-tegra/clock.c | |
| parent | 66e0ed154cfb916b83e3f0074f7cd197effaab39 (diff) | |
| parent | 5edc1199f320e0d9226fe8b73711c6a171ce78de (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts:
drivers/net/wireless/bcm4329/Makefile
Change-Id: I31ce81e09c6f18d6966a5cffebc533453bce02d8
Diffstat (limited to 'arch/arm/mach-tegra/clock.c')
| -rw-r--r-- | arch/arm/mach-tegra/clock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c index de645832ea32..a286f0b9c3a5 100644 --- a/arch/arm/mach-tegra/clock.c +++ b/arch/arm/mach-tegra/clock.c @@ -144,6 +144,7 @@ static unsigned long clk_predict_rate_from_parent(struct clk *c, struct clk *p) if (c->mul != 0 && c->div != 0) { rate *= c->mul; + rate += c->div / 2; /* round up */ do_div(rate, c->div); } |