diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 95563e9..bf4d3dd 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -508,7 +508,7 @@ CONFIG_B43LEGACY_PCI_AUTOSELECT=y
 CONFIG_B43LEGACY_PIO=y
 # CONFIG_B43LEGACY_PIO_MODE is not set
 CONFIG_B43_BCMA=y
-CONFIG_B43_BCMA_EXTRA=y
+# CONFIG_B43_BCMA_EXTRA is not set
 CONFIG_B43_BCMA_PIO=y
 # CONFIG_B43_DEBUG is not set
 CONFIG_B43_HWRNG=y
diff --git a/debian.master/config/enforce b/debian.master/config/enforce
index 4da41d5..9399e23 100644
--- a/debian.master/config/enforce
+++ b/debian.master/config/enforce
@@ -109,3 +109,8 @@ value CONFIG_EFI_VARS y | !exists CONFIG_EFI_VARS
 (!exists CONFIG_DRM_PSB | value CONFIG_DRM_PSB n) | \
 ((value CONFIG_DRM_PSB y | value CONFIG_DRM_PSB m) & (value CONFIG_STUB_POULSBO n | !exists CONFIG_STUB_POULSBO))
 
+# Ensure CONFIG_B43_BCMA_EXTRA is disabled if CONFIG_BRCMSMAC is enabled.
+# Otherwise b43 and brcmsmac will overlap in the hardware they claim to
+# support.
+(!exists CONFIG_BRCMSMAC | value CONFIG_BRCMSMAC n) | \
+((value CONFIG_BRCMSMAC y | value CONFIG_BRCMSMAC m) & (value CONFIG_B43_BCMA_EXTRA n | !exists CONFIG_B43_BCMA_EXTRA))