Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[linux-2.6-omap-h63xx.git] / net / wimax / Kconfig

diff --git a/net/wimax/Kconfig b/net/wimax/Kconfig
index 0bdbb6928205227e79c681cd9d8a1ee498e21705..1b46747a5f5af2cc3521071984629fb1bb63d6dd 100644 (file)
--- a/net/wimax/Kconfig
+++ b/net/wimax/Kconfig
@@ -1,9 +1,23 @@
 #
 # WiMAX LAN device configuration
 #
+# Note the ugly 'depends on' on WIMAX: that disallows RFKILL to be a
+# module if WIMAX is to be linked in. The WiMAX code is done in such a
+# way that it doesn't require and explicit dependency on RFKILL in
+# case an embedded system wants to rip it out.
+#
+# As well, enablement of the RFKILL code means we need the INPUT layer
+# support to inject events coming from hw rfkill switches. That
+# dependency could be killed if input.h provided appropriate means to
+# work when input is disabled.
+
+comment "WiMAX Wireless Broadband support requires CONFIG_INPUT enabled"
+       depends on INPUT = n && RFKILL != n
 
 menuconfig WIMAX
        tristate "WiMAX Wireless Broadband support"
+       depends on (y && RFKILL != m) || m
+       depends on (INPUT && RFKILL != n) || RFKILL = n
        help
 
          Select to configure support for devices that provide