Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / mfd / Kconfig

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index b550267c8d5ed0df8e1d36015b2aca62f0c5d80a..30793602034dff1a8925755fca416ace0b5c2f5f 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -75,6 +75,15 @@ config TWL4030_CORE
          high speed USB OTG transceiver, an audio codec (on most
          versions) and many other features.
 
+config TWL4030_POWER
+       bool "Support power sequencing scripts on TWL4030/TPS659x0"
+       depends on TWL4030_CORE
+       help
+         Say yes here if you want to use the power sequencing scripts on
+         the TWL4030/TPS659x0. These scripts control which regulators or
+         oscillators are switched off or on or reset when a sleep, wakeup
+         or warm reset event occurs.
+
 config MFD_TMIO
        bool
        default n