Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[deliverable/linux.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 894487479f372c3ad92492fb328f25ecc99b0329..1478c6171b001469c6aa190f0fbee738f49e5b7a 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -645,6 +645,7 @@ config ARCH_SHMOBILE
        select NO_IOPORT
        select SPARSE_IRQ
        select MULTI_IRQ_HANDLER
+       select PM_GENERIC_DOMAINS if PM
        help
          Support for Renesas's SH-Mobile and R-Mobile ARM platforms.