Date: Monday, January 9, 2012 @ 12:35:12 Author: tpowa Revision: 146317
apply bcma changes Modified: linux/trunk/config linux/trunk/config.x86_64 ---------------+ config | 9 ++------- config.x86_64 | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) Modified: config =================================================================== --- config 2012-01-09 16:15:38 UTC (rev 146316) +++ config 2012-01-09 17:35:12 UTC (rev 146317) @@ -2266,13 +2266,11 @@ CONFIG_ATH6KL=m # CONFIG_ATH6KL_DEBUG is not set CONFIG_B43=m -CONFIG_B43_BCMA=y CONFIG_B43_SSB=y CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_PCMCIA=y CONFIG_B43_SDIO=y -CONFIG_B43_BCMA_PIO=y CONFIG_B43_PIO=y CONFIG_B43_PHY_N=y CONFIG_B43_PHY_LP=y @@ -2292,6 +2290,7 @@ # CONFIG_B43LEGACY_DMA_MODE is not set # CONFIG_B43LEGACY_PIO_MODE is not set CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m CONFIG_BRCMFMAC=m # CONFIG_BRCMDBG is not set CONFIG_HOSTAP=m @@ -3317,11 +3316,7 @@ # # Broadcom specific AMBA # -CONFIG_BCMA=m -CONFIG_BCMA_BLOCKIO=y -CONFIG_BCMA_HOST_PCI_POSSIBLE=y -CONFIG_BCMA_HOST_PCI=y -# CONFIG_BCMA_DEBUG is not set +# CONFIC_BCMA is not set # # Multifunction device drivers Modified: config.x86_64 =================================================================== --- config.x86_64 2012-01-09 16:15:38 UTC (rev 146316) +++ config.x86_64 2012-01-09 17:35:12 UTC (rev 146317) @@ -2152,13 +2152,11 @@ CONFIG_ATH6KL=m # CONFIG_ATH6KL_DEBUG is not set CONFIG_B43=m -CONFIG_B43_BCMA=y CONFIG_B43_SSB=y CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_PCMCIA=y CONFIG_B43_SDIO=y -CONFIG_B43_BCMA_PIO=y CONFIG_B43_PIO=y CONFIG_B43_PHY_N=y CONFIG_B43_PHY_LP=y @@ -2178,6 +2176,7 @@ # CONFIG_B43LEGACY_DMA_MODE is not set # CONFIG_B43LEGACY_PIO_MODE is not set CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m CONFIG_BRCMFMAC=m # CONFIG_BRCMDBG is not set CONFIG_HOSTAP=m @@ -3166,11 +3165,7 @@ # # Broadcom specific AMBA # -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_BCMA is not set # # Multifunction device drivers