Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / reset / Kconfig

diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index 0b2733d..4be1b8c 100644 (file)
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -12,8 +12,22 @@ menuconfig RESET_CONTROLLER
 
          If unsure, say no.
 
+if RESET_CONTROLLER
+
 config RESET_OXNAS
        bool
 
+config TI_SYSCON_RESET
+       tristate "TI SYSCON Reset Driver"
+       depends on HAS_IOMEM
+       select MFD_SYSCON
+       help
+         This enables the reset driver support for TI devices with
+         memory-mapped reset registers as part of a syscon device node. If
+         you wish to use the reset framework for such memory-mapped devices,
+         say Y here. Otherwise, say N.
+
 source "drivers/reset/sti/Kconfig"
 source "drivers/reset/hisilicon/Kconfig"
+
+endif