From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Thu, 7 Apr 2011 10:37:01 +0000 (+0800)
Subject: acpi: Enable pci, pcib and pci_link by default
X-Git-Tag: v2.11.0~78
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/b184e35561813059c65414206d9fa06a4b2284d1

acpi: Enable pci, pcib and pci_link by default
---

diff --git a/sys/dev/acpica5/acpi_pci_link.c b/sys/dev/acpica5/acpi_pci_link.c
index 3d6bbdccaf..167a72351b 100644
--- a/sys/dev/acpica5/acpi_pci_link.c
+++ b/sys/dev/acpica5/acpi_pci_link.c
@@ -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);
 
diff --git a/sys/dev/acpica5/acpi_pcib_acpi.c b/sys/dev/acpica5/acpi_pcib_acpi.c
index 0bea1d69ee..9debe2478b 100644
--- a/sys/dev/acpica5/acpi_pcib_acpi.c
+++ b/sys/dev/acpica5/acpi_pcib_acpi.c
@@ -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);
 
diff --git a/sys/dev/acpica5/acpi_pcib_pci.c b/sys/dev/acpica5/acpi_pcib_pci.c
index 41e305c06c..e29e1521c2 100644
--- a/sys/dev/acpica5/acpi_pcib_pci.c
+++ b/sys/dev/acpica5/acpi_pcib_pci.c
@@ -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);