--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,6 @@ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) +=
 
 obj-$(CONFIG_COMPAT_NET_USB_MODULES) += drivers/net/usb/
 
-obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/bcma/
 obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/misc/eeprom/
 
 ifeq ($(CONFIG_STAGING_EXCLUDE_BUILD),)
--- a/config.mk
+++ b/config.mk
@@ -369,12 +369,12 @@ export CONFIG_SSB_DRIVER_PCICORE=y
 export CONFIG_B43_SSB=y
 endif #__CONFIG_SSB
 
-export CONFIG_BCMA=m
-export CONFIG_BCMA_BLOCKIO=y
-export CONFIG_BCMA_HOST_PCI=y
+# export CONFIG_BCMA=m
+# export CONFIG_BCMA_BLOCKIO=y
+# export CONFIG_BCMA_HOST_PCI=y
 # export CONFIG_BCMA_DEBUG=y
-export CONFIG_B43_BCMA=y
-export CONFIG_B43_BCMA_EXTRA=y
+# export CONFIG_B43_BCMA=y
+# export CONFIG_B43_BCMA_EXTRA=y
 
 export CONFIG_P54_PCI=m