summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kmcmarti@redhat.com>2013-09-09 12:28:32 -0400
committerKyle McMartin <kmcmarti@redhat.com>2013-09-09 12:28:32 -0400
commita6b4f86d348577ffc19b16d2f9a491e9b2c1a3bc (patch)
treeb350773f0abf76974a8fecb0db47d40c26fa20da
parenta5801d9ae0527972a4f034952bb2749f061a5014 (diff)
downloadkernel-a6b4f86d348577ffc19b16d2f9a491e9b2c1a3bc.tar.gz
kernel-a6b4f86d348577ffc19b16d2f9a491e9b2c1a3bc.tar.xz
kernel-a6b4f86d348577ffc19b16d2f9a491e9b2c1a3bc.zip
[arm] re-enable CONFIG_PCIEPORTBUS, now that tegra is fixed upstream
-rw-r--r--config-arm-generic1
-rw-r--r--kernel.spec3
2 files changed, 3 insertions, 1 deletions
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 <kyle@redhat.com>
+- [arm] re-enable CONFIG_PCIEPORTBUS, now that tegra is fixed upstream.
+
* Mon Sep 09 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git16.1
- Linux v3.11-7890-ge5c832d