diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-11-09 07:44:03 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-11-09 07:44:03 -0500 |
| commit | 33f57de72af0d5753c8e5833eba636c16ed2b306 (patch) | |
| tree | 39b0b7d31c56d10e77cda7ae02d72153adad5895 /config-generic | |
| parent | 27d8a0e9b52f89e4a0033ce8a98aac24e9f1d59b (diff) | |
| download | kernel-33f57de72af0d5753c8e5833eba636c16ed2b306.tar.gz kernel-33f57de72af0d5753c8e5833eba636c16ed2b306.tar.xz kernel-33f57de72af0d5753c8e5833eba636c16ed2b306.zip | |
Linux 3.2-rc1-git1 (upstream 19e0bafc36a)
Enable the brcm80211 modules now that they have left staging
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config-generic b/config-generic index a668c7825..dfccf0cbb 100644 --- a/config-generic +++ b/config-generic @@ -1569,6 +1569,9 @@ CONFIG_B43LEGACY_PIO=y CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y # CONFIG_B43LEGACY_DMA_MODE is not set # CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_BRCMSMAC=m +CONFIG_BRCMFMAC=m +# CONFIG_BRCMDBG is not set CONFIG_HERMES=m CONFIG_HERMES_CACHE_FW_ON_INIT=y # CONFIG_HERMES_PRISM is not set @@ -4488,8 +4491,6 @@ CONFIG_USB_ATMEL=m CONFIG_ALTERA_STAPL=m # CONFIG_DVB_CXD2099 is not set # CONFIG_USBIP_CORE is not set -# CONFIG_BRCMSMAC is not set -# CONFIG_BRCMFMAC is not set # CONFIG_INTEL_MEI is not set # CONFIG_ZCACHE is not set # CONFIG_RTS5139 is not set |