diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-05-08 20:49:09 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-05-08 20:49:09 +0200 |
| commit | 743a6d923f803c861a24d173e1d1818ca8ac0384 (patch) | |
| tree | 29a1c1e8a6a45f7b9319de9155d5346603ee202b /arch/arm/mach-omap2/clock.c | |
| parent | Merge tag 'omap-devel-a-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | Merge branches 'clock_am35xx_cleanup_3.5', 'prm_cm_devel_a_3.5', 'clock_devel... (diff) | |
| download | linux-743a6d923f803c861a24d173e1d1818ca8ac0384.tar.xz linux-743a6d923f803c861a24d173e1d1818ca8ac0384.zip | |
Merge tag 'omap-devel-b-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-prcm
Some OMAP PRCM updates for 3.5. Includes some clock, clockdomain,
powerdomain, PRM, and CM changes.
Diffstat (limited to 'arch/arm/mach-omap2/clock.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index d9f4931513f9..5c4e66542169 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c @@ -439,7 +439,7 @@ void omap2_clk_disable_unused(struct clk *clk) clk->ops->disable(clk); } if (clk->clkdm != NULL) - pwrdm_clkdm_state_switch(clk->clkdm); + pwrdm_state_switch(clk->clkdm->pwrdm.ptr); } #endif |