Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[deliverable/linux.git] / net / rfkill / Kconfig

diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig
index 7f807b30cfbbc2b50a57d3d6531106a24db7d03d..eaf765876458f3a89e5a26af5d5ac3b09c556161 100644 (file)
--- a/net/rfkill/Kconfig
+++ b/net/rfkill/Kconfig
@@ -10,22 +10,15 @@ menuconfig RFKILL
          To compile this driver as a module, choose M here: the
          module will be called rfkill.
 
-config RFKILL_INPUT
-       tristate "Input layer to RF switch connector"
-       depends on RFKILL && INPUT
-       help
-         Say Y here if you want kernel automatically toggle state
-         of RF switches on and off when user presses appropriate
-         button or a key on the keyboard. Without this module you
-         need a some kind of userspace application to control
-         state of the switches.
-
-         To compile this driver as a module, choose M here: the
-         module will be called rfkill-input.
-
 # LED trigger support
 config RFKILL_LEDS
        bool
-       depends on RFKILL && LEDS_TRIGGERS
+       depends on RFKILL
+       depends on LEDS_TRIGGERS = y || RFKILL = LEDS_TRIGGERS
        default y
 
+config RFKILL_INPUT
+       bool "RF switch input support" if EMBEDDED
+       depends on RFKILL
+       depends on INPUT = y || RFKILL = INPUT
+       default y if !EMBEDDED