[kernel] r17296 - in dists/trunk/linux-2.6/debian: . config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Wed May  4 01:52:44 2011
New Revision: 17296

Log:
[x86] Enable BRCMSMAC; the brcmsmac module replaces brcm80211 (Closes: #625510)

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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Wed May  4 01:10:25 2011	(r17295)
+++ dists/trunk/linux-2.6/debian/changelog	Wed May  4 01:52:44 2011	(r17296)
@@ -6,6 +6,8 @@
 
   [ Ben Hutchings
   * xhci-hcd: Include <linux/slab.h> in xhci-pci.c (fixes FTBFS on armel)
+  * [x86] Enable BRCMSMAC; the brcmsmac module replaces brcm80211
+    (Closes: #625510)
 
  -- maximilian attems <maks at debian.org>  Tue, 01 May 2011 14:36:33 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Wed May  4 01:10:25 2011	(r17295)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Wed May  4 01:52:44 2011	(r17296)
@@ -1079,9 +1079,8 @@
 ## file: drivers/staging/brcm80211/Kconfig
 ##
 CONFIG_BRCM80211=m
-## choice: Broadcom IEEE802.11n driver style
-CONFIG_BRCM80211_PCI=y
-## end choice
+CONFIG_BRCMSMAC=y
+# CONFIG_BRCMFMAC is not set
 
 ##
 ## file: drivers/staging/comedi/Kconfig