diff options
Diffstat (limited to 'arch/arm/mach-omap2/pm34xx.c')
-rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index f1976242f99..331dfca93ed 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c | |||
@@ -664,7 +664,7 @@ static void __init prcm_setup_regs(void) | |||
664 | omap3_d2d_idle(); | 664 | omap3_d2d_idle(); |
665 | } | 665 | } |
666 | 666 | ||
667 | static int __init pwrdms_setup(struct powerdomain *pwrdm) | 667 | static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused) |
668 | { | 668 | { |
669 | struct power_state *pwrst; | 669 | struct power_state *pwrst; |
670 | 670 | ||
@@ -689,7 +689,7 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm) | |||
689 | * supported. Initiate sleep transition for other clockdomains, if | 689 | * supported. Initiate sleep transition for other clockdomains, if |
690 | * they are not used | 690 | * they are not used |
691 | */ | 691 | */ |
692 | static int __init clkdms_setup(struct clockdomain *clkdm) | 692 | static int __init clkdms_setup(struct clockdomain *clkdm, void *unused) |
693 | { | 693 | { |
694 | if (clkdm->flags & CLKDM_CAN_ENABLE_AUTO) | 694 | if (clkdm->flags & CLKDM_CAN_ENABLE_AUTO) |
695 | omap2_clkdm_allow_idle(clkdm); | 695 | omap2_clkdm_allow_idle(clkdm); |
@@ -722,13 +722,13 @@ static int __init omap3_pm_init(void) | |||
722 | goto err1; | 722 | goto err1; |
723 | } | 723 | } |
724 | 724 | ||
725 | ret = pwrdm_for_each(pwrdms_setup); | 725 | ret = pwrdm_for_each(pwrdms_setup, NULL); |
726 | if (ret) { | 726 | if (ret) { |
727 | printk(KERN_ERR "Failed to setup powerdomains\n"); | 727 | printk(KERN_ERR "Failed to setup powerdomains\n"); |
728 | goto err2; | 728 | goto err2; |
729 | } | 729 | } |
730 | 730 | ||
731 | (void) clkdm_for_each(clkdms_setup); | 731 | (void) clkdm_for_each(clkdms_setup, NULL); |
732 | 732 | ||
733 | mpu_pwrdm = pwrdm_lookup("mpu_pwrdm"); | 733 | mpu_pwrdm = pwrdm_lookup("mpu_pwrdm"); |
734 | if (mpu_pwrdm == NULL) { | 734 | if (mpu_pwrdm == NULL) { |