diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-20 14:24:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-20 14:25:03 -0400 |
| commit | bfefb7a0c6e08736f2d5917c468467f134bf28bb (patch) | |
| tree | 7aa7084114dc083fe5b4d7b532901bdeb67188e7 /arch/arm/mach-omap2/clock.c | |
| parent | 8d0cc631f6dd0a9283ceb7d61d8b85ecbcd355ea (diff) | |
| parent | 78f28b7c555359c67c2a0d23f7436e915329421e (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: Bring in changes that the next patch will depend on.
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 |