diff options
| author | iwasaki <iwasaki@FreeBSD.org> | 2003-10-29 14:22:09 +0000 |
|---|---|---|
| committer | iwasaki <iwasaki@FreeBSD.org> | 2003-10-29 14:22:09 +0000 |
| commit | 8c1d6750c9ea3bb461fc42b1d2cccf23221c8fcf (patch) | |
| tree | fa8e2cf6077cf70a7b54e9b51faff203a7eb8ca6 /sys | |
| parent | 883f5b44508dcc09274e230ccb9114ace66a40cd (diff) | |
| download | FreeBSD-src-8c1d6750c9ea3bb461fc42b1d2cccf23221c8fcf.zip FreeBSD-src-8c1d6750c9ea3bb461fc42b1d2cccf23221c8fcf.tar.gz | |
Alphabetical order for ACPI options broken by adding ACPI_NO_RESET_VIDEO.
Add short comment about ACPI_NO_RESET_VIDEO into NOTES.
Pointed-out by: njl
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/options | 2 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/conf/options b/sys/conf/options index 18617cb..2af267a 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -598,8 +598,8 @@ WITNESS_SKIPSPIN opt_witness.h # options for ACPI support ACPI_DEBUG opt_acpi.h ACPI_MAX_THREADS opt_acpi.h -ACPI_NO_SEMAPHORES opt_acpi.h ACPI_NO_RESET_VIDEO opt_acpi.h +ACPI_NO_SEMAPHORES opt_acpi.h ACPICA_PEDANTIC opt_acpi.h # options for DEVFS, see sys/fs/devfs/devfs.h diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 9b5a923..ccbe85d 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -412,6 +412,9 @@ options TDFX_LINUX # Enable Linuxulator support # # ACPI_MAX_THREADS sets the number of task threads started. # +# ACPI_NO_RESET_VIDEO disables calling the VESA reset BIOS vector on +# the resume path. +# # ACPI_NO_SEMAPHORES makes the AcpiOs*Semaphore routines a no-op. # # ACPICA_PEDANTIC enables strict checking of AML. Our default is to @@ -424,8 +427,8 @@ options TDFX_LINUX # Enable Linuxulator support device acpi options ACPI_DEBUG options ACPI_MAX_THREADS=1 -#!options ACPI_NO_SEMAPHORES #!options ACPI_NO_RESET_VIDEO +#!options ACPI_NO_SEMAPHORES #!options ACPICA_PEDANTIC # DRM options: |
