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

[Ben Hutchings]

Author: benh
Date: Tue Dec  9 21:59:09 2014
New Revision: 22175

Log:
Fix brcmfmac configuration - bus options are bool not tristate

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

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Tue Dec  9 21:48:02 2014	(r22174)
+++ dists/trunk/linux/debian/changelog	Tue Dec  9 21:59:09 2014	(r22175)
@@ -17,7 +17,8 @@
   * 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
+  * wireless: Enable BRCMFMAC as module for all architectures;
+    enable BRCMFMAC_USB and BRCMFMAC_PCIE
   * wireless: Enable RTL8192EE, RTL8821AE as modules for all architectures
     (replacing R8192EE, R8821AE for x86 only)
   * media: Enable VIDEO_VIVID as module (replacing VIDEO_VIVI)

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Tue Dec  9 21:48:02 2014	(r22174)
+++ dists/trunk/linux/debian/config/config	Tue Dec  9 21:59:09 2014	(r22175)
@@ -1427,6 +1427,7 @@
 CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
 CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_SDR_SUPPORT=y
 CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
 # CONFIG_VIDEO_V4L2_SUBDEV_API is not set
@@ -3065,8 +3066,8 @@
 CONFIG_BRCMSMAC=m
 CONFIG_BRCMFMAC=m
 # CONFIG_BRCMFMAC_SDIO is not set
-CONFIG_BRCMFMAC_USB=m
-CONFIG_BRCMFMAC_PCIE=m
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set