summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2016-05-12 18:04:14 +0100
committerPeter Robinson <pbrobinson@gmail.com>2016-05-12 18:04:14 +0100
commitdf7dea68b2c8b57e116854b2cbe03a4d40342c25 (patch)
treefb458afc231a4fd7408c6285c29103103a157560
parent104dc066906b7d67d2cb72793f181f3deea8f513 (diff)
downloadkernel-df7dea68b2c8b57e116854b2cbe03a4d40342c25.tar.gz
kernel-df7dea68b2c8b57e116854b2cbe03a4d40342c25.tar.xz
kernel-df7dea68b2c8b57e116854b2cbe03a4d40342c25.zip
Enable PCI_HOST_GENERIC for all ARM arches
-rw-r--r--config-arm-generic2
-rw-r--r--config-armv7-generic1
-rw-r--r--kernel.spec1
3 files changed, 2 insertions, 2 deletions
diff --git a/config-arm-generic b/config-arm-generic
index 98a76fabc..5b03071db 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -198,7 +198,7 @@ CONFIG_OF_NET=y
CONFIG_OF_OVERLAY=y
CONFIG_OF_PCI_IRQ=m
CONFIG_OF_PCI=m
-# CONFIG_PCI_HOST_GENERIC is not set
+CONFIG_PCI_HOST_GENERIC=y
# CONFIG_PCIE_IPROC is not set
CONFIG_OF_RESERVED_MEM=y
CONFIG_OF_RESOLVE=y
diff --git a/config-armv7-generic b/config-armv7-generic
index 57ee4ef1f..ed26d946e 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -166,7 +166,6 @@ CONFIG_LSM_MMAP_MIN_ADDR=32768
CONFIG_XZ_DEC_ARM=y
-CONFIG_PCI_HOST_GENERIC=y
# CONFIG_PCI_LAYERSCAPE is not set
# Do NOT enable this, it breaks stuff and makes things go slow
# CONFIG_UACCESS_WITH_MEMCPY is not set
diff --git a/kernel.spec b/kernel.spec
index 43448fc02..3b819f830 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2146,6 +2146,7 @@ fi
%changelog
* Thu May 12 2016 Peter Robinson <pbrobinson@fedoraproject.org>
- Some minor ARMv7 platform fixes from F-24
+- Enable PCI_HOST_GENERIC for all ARM arches
* Wed May 11 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc7.git2.1
- Linux v4.6-rc7-55-gc5114626f33b