projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
Kconfig
diff --git
a/drivers/net/wireless/iwlwifi/Kconfig
b/drivers/net/wireless/iwlwifi/Kconfig
index f844b738d34e529de062d6d22f2941ba5d65e3fa..d5b7a76fcaad62b3d684ad9bf697b4f27d9b3c59 100644
(file)
--- a/
drivers/net/wireless/iwlwifi/Kconfig
+++ b/
drivers/net/wireless/iwlwifi/Kconfig
@@
-1,6
+1,15
@@
+config IWLWIFI
+ bool
+ default n
+
config IWLCORE
tristate "Intel Wireless Wifi Core"
depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
config IWLCORE
tristate "Intel Wireless Wifi Core"
depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
+ 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
bool
config IWLWIFI_LEDS
bool
@@
-9,8
+18,6
@@
config IWLWIFI_LEDS
config IWLWIFI_RFKILL
boolean "IWLWIFI RF kill support"
depends on IWLCORE
config IWLWIFI_RFKILL
boolean "IWLWIFI RF kill support"
depends on IWLCORE
- select RFKILL
- select RFKILL_INPUT
config IWL4965
tristate "Intel Wireless WiFi 4965AGN"
config IWL4965
tristate "Intel Wireless WiFi 4965AGN"
@@
-49,7
+56,7
@@
config IWL4965_HT
config IWL4965_LEDS
bool "Enable LEDS features in iwl4965 driver"
config IWL4965_LEDS
bool "Enable LEDS features in iwl4965 driver"
- depends on IWL4965
&& MAC80211_LEDS && LEDS_CLASS
+ depends on IWL4965
select IWLWIFI_LEDS
---help---
This option enables LEDS for the iwlwifi drivers
select IWLWIFI_LEDS
---help---
This option enables LEDS for the iwlwifi drivers
@@
-104,6
+111,9
@@
config IWL3945
tristate "Intel PRO/Wireless 3945ABG/BG Network Connection"
depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
select FW_LOADER
tristate "Intel PRO/Wireless 3945ABG/BG Network Connection"
depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
select FW_LOADER
+ select IWLWIFI
+ select MAC80211_LEDS if IWL3945_LEDS
+ select LEDS_CLASS if IWL3945_LEDS
---help---
Select to build the driver supporting the:
---help---
Select to build the driver supporting the:
@@
-134,7
+144,7
@@
config IWL3945_SPECTRUM_MEASUREMENT
config IWL3945_LEDS
bool "Enable LEDS features in iwl3945 driver"
config IWL3945_LEDS
bool "Enable LEDS features in iwl3945 driver"
- depends on IWL3945
&& MAC80211_LEDS && LEDS_CLASS
+ depends on IWL3945
---help---
This option enables LEDS for the iwl3945 driver.
---help---
This option enables LEDS for the iwl3945 driver.