diff options
| author | Tony Lindgren | 2011-03-11 18:20:03 +0100 |
|---|---|---|
| committer | Tony Lindgren | 2011-03-11 18:20:03 +0100 |
| commit | a2358a7bc35e388978fc2f7f6b071a0fd27d78c1 (patch) | |
| tree | fbdc2ddb066243a11aebc490c4d54e6a42be51e2 /arch/arm/mach-omap2/cpuidle34xx.c | |
| parent | Merge branch 'for_2.6.39/pm-misc' of ssh://master.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | Merge remote branch 'remotes/origin/voltage_split_2.6.39' into tmp-integratio... (diff) | |
| download | kernel-qcow2-linux-a2358a7bc35e388978fc2f7f6b071a0fd27d78c1.tar.gz kernel-qcow2-linux-a2358a7bc35e388978fc2f7f6b071a0fd27d78c1.tar.xz kernel-qcow2-linux-a2358a7bc35e388978fc2f7f6b071a0fd27d78c1.zip | |
Merge branch 'integration-2.6.39-for-tony' of git://git.pwsan.com/linux-integration into omap-for-linus
Conflicts:
arch/arm/mach-omap2/pm34xx.c
Diffstat (limited to 'arch/arm/mach-omap2/cpuidle34xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/cpuidle34xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c index cba437dd002b..a44c52303405 100644 --- a/arch/arm/mach-omap2/cpuidle34xx.c +++ b/arch/arm/mach-omap2/cpuidle34xx.c @@ -100,14 +100,14 @@ static int omap3_idle_bm_check(void) static int _cpuidle_allow_idle(struct powerdomain *pwrdm, struct clockdomain *clkdm) { - omap2_clkdm_allow_idle(clkdm); + clkdm_allow_idle(clkdm); return 0; } static int _cpuidle_deny_idle(struct powerdomain *pwrdm, struct clockdomain *clkdm) { - omap2_clkdm_deny_idle(clkdm); + clkdm_deny_idle(clkdm); return 0; } |