diff options
author | iwasaki <iwasaki@FreeBSD.org> | 2002-08-30 11:11:07 +0000 |
---|---|---|
committer | iwasaki <iwasaki@FreeBSD.org> | 2002-08-30 11:11:07 +0000 |
commit | 605d09c7f9581052248752fa4c3e1ff632c8c490 (patch) | |
tree | 7ff9ccec9967bb4e7ebd3deaf402ab1030e0b4b7 /sys/boot | |
parent | 8679677c5205b9d84ffb81181aca3a1945d032e2 (diff) | |
download | FreeBSD-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/boot')
-rw-r--r-- | sys/boot/common/loader.8 | 2 | ||||
-rw-r--r-- | sys/boot/i386/libi386/i386_module.c | 2 | ||||
-rw-r--r-- | sys/boot/i386/loader/help.i386 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8 index 2c4dc58..a76e691 100644 --- a/sys/boot/common/loader.8 +++ b/sys/boot/common/loader.8 @@ -313,7 +313,7 @@ These are described below. .It Va acpi_load Unset this to disable automatic loading of the ACPI module. See also -.Va hint.acpi.0.disable +.Va hint.acpi.0.disabled in .Xr device.hints 5 . .It Va autoboot_delay diff --git a/sys/boot/i386/libi386/i386_module.c b/sys/boot/i386/libi386/i386_module.c index 5c29aee..f879727 100644 --- a/sys/boot/i386/libi386/i386_module.c +++ b/sys/boot/i386/libi386/i386_module.c @@ -49,7 +49,7 @@ i386_autoload(void) /* autoload ACPI support */ /* XXX should be in 4th keyed off acpi_load */ - if ((getenv("acpi_load") && !getenv("hint.acpi.0.disable"))) { + if ((getenv("acpi_load") && !getenv("hint.acpi.0.disabled"))) { error = mod_load("acpi", NULL, 0, NULL); if (error != 0) printf("ACPI autoload failed - %s\n", strerror(error)); diff --git a/sys/boot/i386/loader/help.i386 b/sys/boot/i386/loader/help.i386 index f9a4076..16e0fd3 100644 --- a/sys/boot/i386/loader/help.i386 +++ b/sys/boot/i386/loader/help.i386 @@ -7,7 +7,7 @@ unset acpi_load - $hint.acpi.0.disable="1" + $hint.acpi.0.disabled="1" If set, the ACPI module won't be loaded. |