Merge branch 'next/cleanup' into for-next

[karo-tx-linux.git] / arch / arm / mach-shmobile / smp-r8a7791.c

diff --git a/arch/arm/mach-shmobile/smp-r8a7791.c b/arch/arm/mach-shmobile/smp-r8a7791.c
index 7e49e0a52e32a168de45abd40bcb174cae04989c..5e2d1db79afa5316152d031e7bb223d1465c6e57 100644 (file)
--- a/arch/arm/mach-shmobile/smp-r8a7791.c
+++ b/arch/arm/mach-shmobile/smp-r8a7791.c
@@ -27,7 +27,7 @@
 
 static struct rcar_apmu_config r8a7791_apmu_config[] = {
        {
-               .iomem = DEFINE_RES_MEM(0xe6152000, 0x88),
+               .iomem = DEFINE_RES_MEM(0xe6152000, 0x188),
                .cpus = { 0, 1 },
        }
 };
@@ -39,7 +39,7 @@ static void __init r8a7791_smp_prepare_cpus(unsigned int max_cpus)
                                       r8a7791_apmu_config,
                                       ARRAY_SIZE(r8a7791_apmu_config));
 
-       r8a7791_pm_init();
+       rcar_gen2_pm_init();
 }
 
 static int r8a7791_smp_boot_secondary(unsigned int cpu,