summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
authornjl <njl@FreeBSD.org>2004-06-17 17:27:37 +0000
committernjl <njl@FreeBSD.org>2004-06-17 17:27:37 +0000
commitbbd8cdb07b554ccecb7ead05d36280e58505f8e5 (patch)
treed869aa2ddd3f1f9c017df144e0fcfdcb1bdac633 /sys/amd64
parent40dd98a3bd2049465e7644b361b60da41a46efa0 (diff)
downloadFreeBSD-src-bbd8cdb07b554ccecb7ead05d36280e58505f8e5.zip
FreeBSD-src-bbd8cdb07b554ccecb7ead05d36280e58505f8e5.tar.gz
Revert last change. If acpi is loaded or compiled into the kernel, its
devclass will be present even if the driver was disabled by a hint. Using device_get_softc() provides the right info even if it's overkill. Explained by: jhb
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/amd64/bios.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c
index 46c9302..5109e4d 100644
--- a/sys/amd64/amd64/bios.c
+++ b/sys/amd64/amd64/bios.c
@@ -556,7 +556,7 @@ pnpbios_identify(driver_t *driver, device_t parent)
return;
/* ACPI already active */
- if (devclass_find("acpi") != NULL)
+ if (devclass_get_softc(devclass_find("acpi"), 0) != NULL)
return;
/* get count of PnP devices */
OpenPOWER on IntegriCloud