Merge tag 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene...

Merge "Samsung fixes for v3.18" from Kukjin Kim:

- fix ifdef around cpu_*_do_[suspend, resume] ops to check
  CONFIG_ARM_CPU_SUSPEND and not CONFIG_PM_SLEEP
- fix exynos_defconfig build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=n
- fix enabling Samsung PM debug functionality due to recently merged
  patches and previous merge conflicts
- fix pull-up setting in sd4_width8 pin group for exynos4x12

* tag 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: mm: Fix ifdef around cpu_*_do_[suspend, resume] ops
  ARM: EXYNOS: Fix build with PM_SLEEP=n and ARM_EXYNOS_CPUIDLE=n
  ARM: SAMSUNG: Restore Samsung PM Debug functionality
  ARM: dts: Fix pull setting in sd4_width8 pin group for exynos4x12

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined arch/arm/mach-exynos/exynos.c
index b89e5f35db841e50b64a5790af79e0c11c1e783f,d57f136a5a81389e9399a10508e64e0be5984e51..6b283eb3202ec2ecac7e7742e82ab284f38c808c
--- 1/arch/arm/mach-exynos/exynos.c
--- 2/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@@ -161,7 -161,9 +161,9 @@@ static void exynos_restart(enum reboot_
  
  static struct platform_device exynos_cpuidle = {
        .name              = "exynos_cpuidle",
+ #ifdef CONFIG_ARM_EXYNOS_CPUIDLE
        .dev.platform_data = exynos_enter_aftr,
+ #endif
        .id                = -1,
  };
  
@@@ -193,6 -195,7 +195,6 @@@ static void __init exynos_init_late(voi
                /* to be supported later */
                return;
  
 -      pm_genpd_poweroff_unused();
        exynos_pm_init();
  }