Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[sfrench/cifs-2.6.git] / arch / arm / mach-shmobile / Kconfig

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index aa0b1a177d3e23c0090d83546902dc7f4709b18b..f2bc5c353119e96de7fad68ff4daf43686e3f851 100644 (file)
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -6,28 +6,30 @@ config ARCH_SHMOBILE_MULTI
 
 config PM_RCAR
        bool
-       select PM_GENERIC_DOMAINS if PM
+       select PM
+       select PM_GENERIC_DOMAINS
 
 config PM_RMOBILE
        bool
+       select PM
        select PM_GENERIC_DOMAINS
 
 config ARCH_RCAR_GEN1
        bool
-       select PM_RCAR if PM || SMP
+       select PM_RCAR
        select RENESAS_INTC_IRQPIN
        select SYS_SUPPORTS_SH_TMU
 
 config ARCH_RCAR_GEN2
        bool
-       select PM_RCAR if PM || SMP
+       select PM_RCAR
        select RENESAS_IRQC
        select SYS_SUPPORTS_SH_CMT
        select PCI_DOMAINS if PCI
 
 config ARCH_RMOBILE
        bool
-       select PM_RMOBILE if PM
+       select PM_RMOBILE
        select SYS_SUPPORTS_SH_CMT
        select SYS_SUPPORTS_SH_TMU
 
@@ -55,7 +57,8 @@ config ARCH_EMEV2
 
 config ARCH_R7S72100
        bool "RZ/A1H (R7S72100)"
-       select PM_GENERIC_DOMAINS if PM
+       select PM
+       select PM_GENERIC_DOMAINS
        select SYS_SUPPORTS_SH_MTU2
 
 config ARCH_R8A73A4