diff --git a/config-arm-generic b/config-arm-generic
index 79716bd..5000b5b 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -100,3 +100,4 @@ CONFIG_SMC911X=m
 # CONFIG_MMC_SDHCI_PXAV3 is not set
 # CONFIG_COMMON_CLK_SI5351 is not set
 # CONFIG_LOCK_STAT is not set
+# CONFIG_PCIEPORTBUS is not set
diff --git a/kernel.spec b/kernel.spec
index 8e9ec2b..9ae449e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2315,6 +2315,10 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Wed Sep 4 2013 Kyle McMartin <kyle@redhat.com>
+- [arm] Disable CONFIG_PCIEPORTBUS in arm-generic, causes untold problems
+  with registering bus windows on tegra.
+
 * Wed Sep 4 2013 Josh Boyer <jwboyer@fedoraproject.org>
 - Update linux-firmware requirements for newer radeon firmware (rhbz 988268 972518)