Merge remote-tracking branch 'asoc/topic/wm8400' into asoc-next

[~andy/linux] / net / rfkill / Kconfig

diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig
index 7fce6dfd2180af0ecaed0d3e82bb7afcc604001a..78efe895b6636c4a57af6d72f156501e2c778992 100644 (file)
--- a/net/rfkill/Kconfig
+++ b/net/rfkill/Kconfig
@@ -22,3 +22,23 @@ config RFKILL_INPUT
        depends on RFKILL
        depends on INPUT = y || RFKILL = INPUT
        default y if !EXPERT
+
+config RFKILL_REGULATOR
+       tristate "Generic rfkill regulator driver"
+       depends on RFKILL || !RFKILL
+       depends on REGULATOR
+       help
+          This options enable controlling radio transmitters connected to
+          voltage regulator using the regulator framework.
+
+          To compile this driver as a module, choose M here: the module will
+          be called rfkill-regulator.
+
+config RFKILL_GPIO
+       tristate "GPIO RFKILL driver"
+       depends on RFKILL && GPIOLIB && HAVE_CLK
+       default n
+       help
+         If you say yes here you get support of a generic gpio RFKILL
+         driver. The platform should fill in the appropriate fields in the
+         rfkill_gpio_platform_data structure and pass that to the driver.