summaryrefslogtreecommitdiffstats
path: root/sys/dev/acpica/acpi.c
diff options
context:
space:
mode:
authoriwasaki <iwasaki@FreeBSD.org>2002-08-30 11:11:07 +0000
committeriwasaki <iwasaki@FreeBSD.org>2002-08-30 11:11:07 +0000
commit605d09c7f9581052248752fa4c3e1ff632c8c490 (patch)
tree7ff9ccec9967bb4e7ebd3deaf402ab1030e0b4b7 /sys/dev/acpica/acpi.c
parent8679677c5205b9d84ffb81181aca3a1945d032e2 (diff)
downloadFreeBSD-src-605d09c7f9581052248752fa4c3e1ff632c8c490.zip
FreeBSD-src-605d09c7f9581052248752fa4c3e1ff632c8c490.tar.gz
s/hint.acpi.0.disable/hint.acpi.0.disabled/
Fix device hints entry for disabling acpi(4). This also should fix the arbitration with apm(4) when both drivers are enabled. Note that your /boot/device.hints needs to be updated if you want to stop auto-loading acpi.ko or disable acpi(4).
Diffstat (limited to 'sys/dev/acpica/acpi.c')
-rw-r--r--sys/dev/acpica/acpi.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index 48e9889..78eceb6 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -2118,6 +2118,11 @@ out:
static void
acpi_pm_register(void *arg)
{
+ int error;
+
+ if (!resource_int_value("acpi", 0, "disabled", &error) &&
+ (error != 0))
+ return;
power_pm_register(POWER_PM_TYPE_ACPI, acpi_pm_func, NULL);
}
OpenPOWER on IntegriCloud