summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kmcmarti@redhat.com>2014-07-24 19:20:52 -0400
committerKyle McMartin <kmcmarti@redhat.com>2014-07-24 19:20:52 -0400
commitf12a594c2d6e1a3cb7e9afcc917dcc41b7a27bd3 (patch)
treef33c743e0ce26b083a9a310c65b5f15c08ee1420
parentf7f5d678add5a5b5c2a435457024bd2444cfaad9 (diff)
downloadkernel-f12a594c2d6e1a3cb7e9afcc917dcc41b7a27bd3.tar.gz
kernel-f12a594c2d6e1a3cb7e9afcc917dcc41b7a27bd3.tar.xz
kernel-f12a594c2d6e1a3cb7e9afcc917dcc41b7a27bd3.zip
arm64: update config-arm64 to include PCI support.
-rw-r--r--config-arm645
-rw-r--r--kernel.spec1
2 files changed, 6 insertions, 0 deletions
diff --git a/config-arm64 b/config-arm64
index be0c3cb5c..082ceda8d 100644
--- a/config-arm64
+++ b/config-arm64
@@ -106,3 +106,8 @@ CONFIG_RTC_DRV_EFI=y
# dma issues in headers
# CONFIG_PARPORT_PC is not set
# CONFIG_VGA_CONSOLE is not set
+
+CONFIG_PCI_XGENE=y
+CONFIG_HOTPLUG_PCI=y
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+# CONFIG_HOTPLUG_PCI_SHPC is not set
diff --git a/kernel.spec b/kernel.spec
index 76be12261..ce514e750 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2254,6 +2254,7 @@ fi
%changelog
* Thu Jul 24 2014 Kyle McMartin <kyle@fedoraproject.org>
- kernel-arm64.patch: update from upstream git.
+- arm64: update config-arm64 to include PCI support.
* Thu Jul 24 2014 Josh Boyer <jwboyer@fedoraproject.org>
- CVE-2014-5045 vfs: refcount issues during lazy umount on symlink (rhbz 1122471 1122482)