Fix brcmfmac configuration - bus options are bool not tristate

svn path=/dists/trunk/linux/; revision=22175
This commit is contained in:
Ben Hutchings 2014-12-09 21:59:09 +00:00
parent 822f235e03
commit 359821b177
2 changed files with 5 additions and 3 deletions

3
debian/changelog vendored
View File

@ -17,7 +17,8 @@ linux (3.18-1~exp1) UNRELEASED; urgency=medium
* 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)

View File

@ -1427,6 +1427,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
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_B43LEGACY_DMA_AND_PIO_MODE=y
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