From 380eaa283984b0ccc4a407fd98417bbe5954251e Mon Sep 17 00:00:00 2001 From: bz Date: Tue, 22 Mar 2016 12:12:01 +0000 Subject: 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 --- sys/conf/files.arm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.1