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

[Ben Hutchings]

Author: benh
Date: Tue Dec  9 20:34:06 2014
New Revision: 22165

Log:
wireless: Enable BRCMFMAC, BRCMFMAC_USB, BRCMFMAC_PCIE as modules

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

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Tue Dec  9 20:05:42 2014	(r22164)
+++ dists/trunk/linux/debian/changelog	Tue Dec  9 20:34:06 2014	(r22165)
@@ -17,6 +17,7 @@
   * SCSI,xen: Enable XEN_SCSI_FRONTEND, XEN_SCSI_BACKEND as modules
   * SCSI: Re-enable LIBFCOE, FCOE, FCOE_FNIC, SCSI_BNX2X_FCOE as modules
   * drivers/net: Enable ET131X as module for all architectures
+  * wireless: Enable BRCMFMAC, BRCMFMAC_USB, BRCMFMAC_PCIE as modules
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 09 Dec 2014 02:08:47 +0000
 

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Tue Dec  9 20:05:42 2014	(r22164)
+++ dists/trunk/linux/debian/config/config	Tue Dec  9 20:34:06 2014	(r22165)
@@ -3058,7 +3058,10 @@
 ## file: drivers/net/wireless/brcm80211/Kconfig
 ##
 CONFIG_BRCMSMAC=m
-# CONFIG_BRCMFMAC is not set
+CONFIG_BRCMFMAC=m
+# CONFIG_BRCMFMAC_SDIO is not set
+CONFIG_BRCMFMAC_USB=m
+CONFIG_BRCMFMAC_PCIE=m
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set
 

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config	Tue Dec  9 20:05:42 2014	(r22164)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config	Tue Dec  9 20:34:06 2014	(r22165)
@@ -1099,10 +1099,8 @@
 ##
 ## file: drivers/net/wireless/brcm80211/Kconfig
 ##
-CONFIG_BRCMFMAC=m
 #. Sony Vaio laptops
 CONFIG_BRCMFMAC_SDIO=y
-# CONFIG_BRCMFMAC_USB is not set
 
 ##
 ## file: drivers/net/wireless/mwifiex/Kconfig