diff options
author | Tony Lindgren <tony@atomide.com> | 2012-05-08 18:49:09 (GMT) |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-05-08 18:49:09 (GMT) |
commit | 743a6d923f803c861a24d173e1d1818ca8ac0384 (patch) | |
tree | 29a1c1e8a6a45f7b9319de9155d5346603ee202b /arch/arm/mach-omap2/clock.c | |
parent | 1df82cd6d7673006ae2ecbe8745bcf44f61c53a8 (diff) | |
parent | 0135f6a04642c192bdf4b36e06937d3387e174ff (diff) | |
download | linux-743a6d923f803c861a24d173e1d1818ca8ac0384.tar.xz |
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 d9f4931..5c4e665 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 |