diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:42 -0400 |
| commit | ae82bfd61ca7e57cc2d914add9ab0873e260f2f5 (patch) | |
| tree | a7f862ad8b0ae4f2e8953e6aa613eb702b484ecf /arch/arm/mach-omap2/clock.c | |
| parent | cd74c86bdf705f824d494a2bbda393d1d562b40a (diff) | |
| parent | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (diff) | |
Merge branch 'linus' into perfcounters/rename
Merge reason: pull in all the latest code before doing the rename.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-omap2/clock.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index 456e2ad5f621..f2a92d614f0f 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c | |||
| @@ -1043,5 +1043,7 @@ void omap2_clk_disable_unused(struct clk *clk) | |||
| 1043 | omap2_clk_disable(clk); | 1043 | omap2_clk_disable(clk); |
| 1044 | } else | 1044 | } else |
| 1045 | _omap2_clk_disable(clk); | 1045 | _omap2_clk_disable(clk); |
| 1046 | if (clk->clkdm != NULL) | ||
| 1047 | pwrdm_clkdm_state_switch(clk->clkdm); | ||
| 1046 | } | 1048 | } |
| 1047 | #endif | 1049 | #endif |