diff --git a/config-arm-generic b/config-arm-generic index 5000b5b5a..79716bdfa 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -100,4 +100,3 @@ 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 7a8f54940..d363df49e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2297,6 +2297,9 @@ fi # ||----w | # || || %changelog +* Mon Sep 09 2013 Kyle McMartin +- [arm] re-enable CONFIG_PCIEPORTBUS, now that tegra is fixed upstream. + * Mon Sep 09 2013 Josh Boyer - 3.12.0-0.rc0.git16.1 - Linux v3.11-7890-ge5c832d