acpi: Enable pci, pcib and pci_link by default
authorSepherosa Ziehau <sephe@dragonflybsd.org>
Thu, 7 Apr 2011 10:37:01 +0000 (18:37 +0800)
committerSepherosa Ziehau <sephe@dragonflybsd.org>
Thu, 7 Apr 2011 10:37:01 +0000 (18:37 +0800)
sys/dev/acpica5/acpi_pci_link.c
sys/dev/acpica5/acpi_pcib_acpi.c
sys/dev/acpica5/acpi_pcib_pci.c

index 3d6bbdc..167a723 100644 (file)
@@ -152,7 +152,7 @@ acpi_pci_link_probe(device_t dev)
         * We explicitly do not check _STA since not all systems set it to
         * sensible values.
         */
-       if (!acpi_enabled("pci_link") ||
+       if (acpi_disabled("pci_link") ||
            ACPI_ID_PROBE(device_get_parent(dev), dev, pci_link_ids) == NULL)
                return (ENXIO);
 
index 0bea1d6..9debe24 100644 (file)
@@ -132,7 +132,7 @@ acpi_pcib_acpi_probe(device_t dev)
 {
     static char *pcib_ids[] = { "PNP0A03", NULL };
 
-    if (!acpi_enabled("pcib") ||
+    if (acpi_disabled("pcib") ||
        ACPI_ID_PROBE(device_get_parent(dev), dev, pcib_ids) == NULL)
        return (ENXIO);
 
index 41e305c..e29e152 100644 (file)
@@ -113,7 +113,7 @@ acpi_pcib_pci_probe(device_t dev)
 {
     if (pci_get_class(dev) != PCIC_BRIDGE ||
        pci_get_subclass(dev) != PCIS_BRIDGE_PCI ||
-       !acpi_enabled("pci"))
+       acpi_disabled("pci"))
        return (ENXIO);
     if (acpi_get_handle(dev) == NULL)
        return (ENXIO);