From 605d09c7f9581052248752fa4c3e1ff632c8c490 Mon Sep 17 00:00:00 2001 From: iwasaki Date: Fri, 30 Aug 2002 11:11:07 +0000 Subject: 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). --- sys/dev/acpica/acpi.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sys/dev/acpica/acpi.c') 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); } -- cgit v1.1