diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-11 10:03:43 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-11 10:03:43 -0500 |
| commit | 2be549056941a6d25e0a78978210b8314df69fa5 (patch) | |
| tree | dc2a7580d41ffa8be314b2fb3171cc8b537feedc /config-generic | |
| parent | 9b8fcc47a0f9c8efbeaf23915d976dd26169de03 (diff) | |
| download | kernel-2be549056941a6d25e0a78978210b8314df69fa5.tar.gz kernel-2be549056941a6d25e0a78978210b8314df69fa5.tar.xz kernel-2be549056941a6d25e0a78978210b8314df69fa5.zip | |
Remove overlap between bcma/b43 and brcmsmac and reenable bcm4331
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config-generic b/config-generic index dfccf0cbb..341c2834c 100644 --- a/config-generic +++ b/config-generic @@ -1557,6 +1557,7 @@ CONFIG_B43=m CONFIG_B43_PCMCIA=y CONFIG_B43_SDIO=y CONFIG_B43_BCMA=y +CONFIG_B43_BCMA_PIO=y CONFIG_B43_DEBUG=y CONFIG_B43_PHY_LP=y CONFIG_B43_PHY_N=y @@ -4675,7 +4676,11 @@ CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 CONFIG_TEST_KSTRTOX=m -# CONFIG_BCMA is not set +CONFIG_BCMA=m +CONFIG_BCMA_BLOCKIO=y +CONFIG_BCMA_HOST_PCI_POSSIBLE=y +CONFIG_BCMA_HOST_PCI=y +# CONFIG_BCMA_DEBUG is not set # CONFIG_GOOGLE_FIRMWARE is not set CONFIG_INTEL_MID_PTI=m |