summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbz <bz@FreeBSD.org>2016-03-22 12:12:01 +0000
committerbz <bz@FreeBSD.org>2016-03-22 12:12:01 +0000
commit380eaa283984b0ccc4a407fd98417bbe5954251e (patch)
tree5b7d163c401c2743015e79a2bc4697c02f9f6c65
parent2a4182c2911141820c2a3d497bde4bc8f81ddde5 (diff)
downloadFreeBSD-src-380eaa283984b0ccc4a407fd98417bbe5954251e.zip
FreeBSD-src-380eaa283984b0ccc4a407fd98417bbe5954251e.tar.gz
Adding pci_host_generic unconditionally breaks ARM boards with a PCI(e) interface.
Make it a device option to be included in the kernel configs that request this file. Reported by: mmel Suggested by: mmel Reviewed by: mmel Differential Revision: https://reviews.freebsd.org/D5699
-rw-r--r--sys/conf/files.arm2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index 51da5b3..5d3eedf 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -103,7 +103,7 @@ dev/hwpmc/hwpmc_arm.c optional hwpmc
dev/hwpmc/hwpmc_armv7.c optional hwpmc armv6
dev/iicbus/twsi/twsi.c optional twsi
dev/ofw/ofw_cpu.c optional fdt
-dev/pci/pci_host_generic.c optional pci fdt
+dev/pci/pci_host_generic.c optional pci_host_generic pci fdt
dev/psci/psci.c optional psci
dev/psci/psci_arm.S optional psci
dev/syscons/scgfbrndr.c optional sc
OpenPOWER on IntegriCloud