Commit 71f78afd67ca51d3656ba45aea293d6e2a27c8bc
Committed by
David S. Miller
David S. Miller
1 parent
d48e470f76
Exists in
master
and in
20 other branches
wimax: fix kconfig interactions with rfkill and input layers
WiMAX can work without RFKILL, but it was missing a check to make sure RFKILL is not being made a module with wimax compiled into the kernel. This caused failed builds in s390, where CONFIG_INPUT is always off. When RFKILL is enabled, the code uses the input layer to report hardware switch changes; thus, if RFKILL is enabled, INPUT has to be too. It also needs to display some message when INPUT is disabled that explains why WiMAX is not selectable. (issues found by Randy Dunlap in the linux-next tree). Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Showing 1 changed file with 14 additions and 0 deletions Side-by-side Diff
net/wimax/Kconfig
| 1 | 1 | # |
| 2 | 2 | # WiMAX LAN device configuration |
| 3 | 3 | # |
| 4 | +# Note the ugly 'depends on' on WIMAX: that disallows RFKILL to be a | |
| 5 | +# module if WIMAX is to be linked in. The WiMAX code is done in such a | |
| 6 | +# way that it doesn't require and explicit dependency on RFKILL in | |
| 7 | +# case an embedded system wants to rip it out. | |
| 8 | +# | |
| 9 | +# As well, enablement of the RFKILL code means we need the INPUT layer | |
| 10 | +# support to inject events coming from hw rfkill switches. That | |
| 11 | +# dependency could be killed if input.h provided appropiate means to | |
| 12 | +# work when input is disabled. | |
| 4 | 13 | |
| 14 | +comment "WiMAX Wireless Broadband support requires CONFIG_INPUT enabled" | |
| 15 | + depends on INPUT = n && RFKILL != n | |
| 16 | + | |
| 5 | 17 | menuconfig WIMAX |
| 6 | 18 | tristate "WiMAX Wireless Broadband support" |
| 19 | + depends on (y && RFKILL != m) || m | |
| 20 | + depends on (INPUT && RFKILL != n) || RFKILL = n | |
| 7 | 21 | help |
| 8 | 22 | |
| 9 | 23 | Select to configure support for devices that provide |