iwlwifi: move the selects to the tristate drivers
This patch moves the following select's: - RFKILL : IWLWIFI_RFKILL -> IWLCORE - RFKILL_INPUT : IWLWIFI_RFKILL -> IWLCORE - MAC80211_LEDS : IWL4965_LEDS -> IWLCORE - LEDS_CLASS : IWL4965_LEDS -> IWLCORE - MAC80211_LEDS : IWL3945_LEDS -> IWL3945 - LEDS_CLASS : IWL3945_LEDS -> IWL3945 The effects are: - with IWLCORE=m and/or IWL3945=m RFKILL/RFKILL_INPUT/MAC80211_LEDS/LEDS_CLASS are no longer wrongly forced to y - fixes a build error with IWLCORE=y, IWL4965=m might be a bug in kconfig causing it, but doing this change that is anyway the right thing fixes it Reported-by: Carlos R. Mafra <crmafra2@gmail.com> Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
45e741b890
commit
3a8209d19d
@@ -6,6 +6,10 @@ config IWLCORE
|
|||||||
tristate "Intel Wireless Wifi Core"
|
tristate "Intel Wireless Wifi Core"
|
||||||
depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
|
depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
|
||||||
select IWLWIFI
|
select IWLWIFI
|
||||||
|
select MAC80211_LEDS if IWLWIFI_LEDS
|
||||||
|
select LEDS_CLASS if IWLWIFI_LEDS
|
||||||
|
select RFKILL if IWLWIFI_RFKILL
|
||||||
|
select RFKILL_INPUT if IWLWIFI_RFKILL
|
||||||
|
|
||||||
config IWLWIFI_LEDS
|
config IWLWIFI_LEDS
|
||||||
bool
|
bool
|
||||||
@@ -14,8 +18,6 @@ config IWLWIFI_LEDS
|
|||||||
config IWLWIFI_RFKILL
|
config IWLWIFI_RFKILL
|
||||||
boolean "IWLWIFI RF kill support"
|
boolean "IWLWIFI RF kill support"
|
||||||
depends on IWLCORE
|
depends on IWLCORE
|
||||||
select RFKILL
|
|
||||||
select RFKILL_INPUT
|
|
||||||
|
|
||||||
config IWL4965
|
config IWL4965
|
||||||
tristate "Intel Wireless WiFi 4965AGN"
|
tristate "Intel Wireless WiFi 4965AGN"
|
||||||
@@ -55,8 +57,6 @@ config IWL4965_HT
|
|||||||
config IWL4965_LEDS
|
config IWL4965_LEDS
|
||||||
bool "Enable LEDS features in iwl4965 driver"
|
bool "Enable LEDS features in iwl4965 driver"
|
||||||
depends on IWL4965
|
depends on IWL4965
|
||||||
select MAC80211_LEDS
|
|
||||||
select LEDS_CLASS
|
|
||||||
select IWLWIFI_LEDS
|
select IWLWIFI_LEDS
|
||||||
---help---
|
---help---
|
||||||
This option enables LEDS for the iwlwifi drivers
|
This option enables LEDS for the iwlwifi drivers
|
||||||
@@ -112,6 +112,8 @@ config IWL3945
|
|||||||
depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
|
depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
|
||||||
select FW_LOADER
|
select FW_LOADER
|
||||||
select IWLWIFI
|
select IWLWIFI
|
||||||
|
select MAC80211_LEDS if IWL3945_LEDS
|
||||||
|
select LEDS_CLASS if IWL3945_LEDS
|
||||||
---help---
|
---help---
|
||||||
Select to build the driver supporting the:
|
Select to build the driver supporting the:
|
||||||
|
|
||||||
@@ -143,8 +145,6 @@ config IWL3945_SPECTRUM_MEASUREMENT
|
|||||||
config IWL3945_LEDS
|
config IWL3945_LEDS
|
||||||
bool "Enable LEDS features in iwl3945 driver"
|
bool "Enable LEDS features in iwl3945 driver"
|
||||||
depends on IWL3945
|
depends on IWL3945
|
||||||
select MAC80211_LEDS
|
|
||||||
select LEDS_CLASS
|
|
||||||
---help---
|
---help---
|
||||||
This option enables LEDS for the iwl3945 driver.
|
This option enables LEDS for the iwl3945 driver.
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user