diff --git a/config-generic b/config-generic
index 60562afc9..e2af80f0d 100644
--- a/config-generic
+++ b/config-generic
@@ -4707,9 +4707,7 @@ CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 
 CONFIG_TEST_KSTRTOX=m
 
-CONFIG_BCMA=m
-CONFIG_BCMA_HOST_PCI=y
-# CONFIG_BCMA_DEBUG is not set
+# CONFIG_BCMA is not set
 
 # CONFIG_GOOGLE_FIRMWARE is not set
 CONFIG_INTEL_MID_PTI=m
diff --git a/kernel.spec b/kernel.spec
index a1e70f246..cfff03355 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1891,6 +1891,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Wed Aug 03 2011 John W. Linville <linville@redhat.com>
+- Disable CONFIG_BCMA since no driver currently uses it (rhbz 727796)
+
 * Tue Aug 02 2011 Dave Jones <davej@redhat.com>
 - Change USB_SERIAL_OPTION back to modular. (rhbz 727680)