---

yaml
---
r: 78990
b: refs/heads/master
c: bb8c093
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 403ab56b1c2786b0e1d58c27f5ce667b529c7faa
+refs/heads/master: bb8c093bdea62f2ae371b98ebff81b0407852faf

trunk/drivers/net/wireless/iwlwifi/Kconfig

@@ -1,8 +1,7 @@
 config IWL4965
 	tristate "Intel Wireless WiFi 4965AGN"
-	depends on m && PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
+	depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
 	select FW_LOADER
-	default m
 	---help---
 	  Select to build the driver supporting the:
 
@@ -30,22 +29,19 @@ config IWL4965
 config IWL4965_QOS
 	bool "Enable Wireless QoS in iwl4965 driver"
 	depends on IWL4965
-	default y
 	---help---
 	  This option will enable wireless quality of service (QoS) for the
 	  iw4965 driver.
 
 config IWL4965_SPECTRUM_MEASUREMENT
 	bool "Enable Spectrum Measurement in iw4965 driver"
 	depends on IWL4965
-	default y
 	---help---
 	  This option will enable spectrum measurement for the iwl4965 driver.
 
 config IWL4965_SENSITIVITY
 	bool "Enable Sensitivity Calibration in iwl4965 driver"
 	depends on IWL4965
-	default y
 	---help---
 	  This option will enable sensitivity calibration for the iwl4965
 	  driver.
@@ -54,15 +50,13 @@ config IWL4965_HT
 	bool "Enable 802.11n HT features in iwl4965 driver"
 	depends on EXPERIMENTAL
 	depends on IWL4965 && MAC80211_HT
-	default n
 	---help---
 	  This option enables IEEE 802.11n High Throughput features
 	  for the iwl4965 driver.
 
 config IWL4965_DEBUG
 	bool "Enable full debugging output in iwl4965 driver"
 	depends on IWL4965
-	default y
 	---help---
 	  This option will enable debug tracing output for the iwl4965
 	  driver.
@@ -88,9 +82,8 @@ config IWL4965_DEBUG
 
 config IWL3945
 	tristate "Intel PRO/Wireless 3945ABG/BG Network Connection"
-	depends on m && PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
+	depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
 	select FW_LOADER
-	default m
 	---help---
 	  Select to build the driver supporting the:
 
@@ -118,22 +111,19 @@ config IWL3945
 config IWL3945_QOS
 	bool "Enable Wireless QoS in iwl3945 driver"
 	depends on IWL3945
-	default y
 	---help---
 	  This option will enable wireless quality of service (QoS) for the
 	  iwl3945 driver.
 
 config IWL3945_SPECTRUM_MEASUREMENT
 	bool "Enable Spectrum Measurement in iwl3945 drivers"
 	depends on IWL3945
-	default y
 	---help---
 	  This option will enable spectrum measurement for the iwl3945 driver.
 
 config IWL3945_DEBUG
 	bool "Enable full debugging output in iwl3945 driver"
 	depends on IWL3945
-	default y
 	---help---
 	  This option will enable debug tracing output for the iwl3945
 	  driver.