[kernel] r17257 - in dists/trunk/linux-2.6/debian: . config

[Ben Hutchings]

Author: benh
Date: Tue Apr 26 04:15:41 2011
New Revision: 17257

Log:
net/wireless: Adjust config for iwlegacy/iwlwifi split (Closes: #624124)

Enable IWLWIFI_LEGACY as module
Enable IWL4965 as module; it is no longer part of the iwlagn module

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Tue Apr 26 03:02:51 2011	(r17256)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Apr 26 04:15:41 2011	(r17257)
@@ -2,6 +2,9 @@
 
   [ Ben Hutchings ]
   * [powerpc] kexec: Fix build failure on 32-bit SMP
+  * net/wireless: Adjust config for iwlegacy/iwlwifi split (Closes: #624124)
+    - Enable IWLWIFI_LEGACY as module
+    - Enable IWL4965 as module; it is no longer part of the iwlagn module
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 25 Apr 2011 02:08:20 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Tue Apr 26 03:02:51 2011	(r17256)
+++ dists/trunk/linux-2.6/debian/config/config	Tue Apr 26 04:15:41 2011	(r17257)
@@ -1928,15 +1928,20 @@
 # CONFIG_LIBIPW_DEBUG is not set
 
 ##
+## file: drivers/net/wireless/iwlegacy/Kconfig
+##
+CONFIG_IWLWIFI_LEGACY=m
+# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
+# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+##
 ## file: drivers/net/wireless/iwlwifi/Kconfig
 ##
-CONFIG_IWLWIFI=m
+CONFIG_IWLAGN=m
 # CONFIG_IWLWIFI_DEBUG is not set
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
-CONFIG_IWL3945=m
 
 ##
 ## file: drivers/net/wireless/iwmc3200wifi/Kconfig