Merge tag 'pm+acpi-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-block.git] / drivers / power / reset / Kconfig

diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
index 27f6646731b0d3e7f829f1828f3b5ce904219aae..17d93a73c5136e53ab2955d7aba02a7ef0c85d1f 100644 (file)
--- a/drivers/power/reset/Kconfig
+++ b/drivers/power/reset/Kconfig
@@ -41,6 +41,7 @@ config POWER_RESET_AXXIA
 config POWER_RESET_BRCMSTB
        bool "Broadcom STB reset driver"
        depends on ARM || MIPS || COMPILE_TEST
+       depends on MFD_SYSCON
        default ARCH_BRCMSTB
        help
          This driver provides restart support for Broadcom STB boards.
@@ -151,9 +152,17 @@ config POWER_RESET_SYSCON
        help
          Reboot support for generic SYSCON mapped register reset.
 
+config POWER_RESET_SYSCON_POWEROFF
+       bool "Generic SYSCON regmap poweroff driver"
+       depends on OF
+       select MFD_SYSCON
+       help
+         Poweroff support for generic SYSCON mapped register poweroff.
+
 config POWER_RESET_RMOBILE
        tristate "Renesas R-Mobile reset driver"
        depends on ARCH_RMOBILE || COMPILE_TEST
+       depends on HAS_IOMEM
        help
          Reboot support for Renesas R-Mobile and SH-Mobile SoCs.