Add ACPI_ENABLE_PCI option.

diff --git a/sys/bus/pci/pci.c b/sys/bus/pci/pci.c
index d3b843d..b10b329 100644 (file)
--- a/sys/bus/pci/pci.c
+++ b/sys/bus/pci/pci.c
@@ -29,6 +29,7 @@
  */
 
 #include "opt_bus.h"
+#include "opt_acpi.h"
 #include "opt_compat_oldpci.h"
 
 #include <sys/param.h>
@@ -2876,7 +2877,7 @@ pci_add_resources(device_t pcib, device_t bus, device_t dev, int force, uint32_t
        }
 
        if (cfg->intpin > 0 && PCI_INTERRUPT_VALID(cfg->intline)) {
-#if defined(__PCI_REROUTE_INTERRUPT) || defined(APIC_IO)
+#if defined(__PCI_REROUTE_INTERRUPT) || defined(APIC_IO) || defined(ACPI_ENABLE_PCI)
                /*
                 * Try to re-route interrupts. Sometimes the BIOS or
                 * firmware may leave bogus values in these registers.

diff --git a/sys/conf/options b/sys/conf/options
index 8a7cca3..61c8bbd 100644 (file)
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -81,6 +81,7 @@ TWA_FLASH_FIRMWARE    opt_twa.h
 ACPI_DEBUG             opt_acpi.h
 ACPI_NO_SEMAPHORES     opt_acpi.h
 ACPI_QUIRK_VMWARE      opt_acpi.h
+ACPI_ENABLE_PCI                opt_acpi.h
 
 # Miscellaneous options.
 COMPAT_DF12    opt_compatdf12.h