Cover some of the recently added ACPI modules by the LINT build.

While here, add some better descriptions for ACPI stuff in LINT (taken
from FreeBSD).

diff --git a/sys/conf/files b/sys/conf/files
index 16a8466..562d7fd 100644 (file)
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1710,6 +1710,7 @@ ${OSACPI_MI_DIR}/acpi_powerres.c  optional acpi
 ${OSACPI_MI_DIR}/acpi_resource.c       optional acpi
 ${OSACPI_MI_DIR}/acpi_thermal.c                optional acpi
 ${OSACPI_MI_DIR}/acpi_timer.c          optional acpi
+#${OSACPI_MI_DIR}/acpi_wmi_if.m                optional acpi
 ${OSACPI_MI_DIR}/Osd/OsdCache.c                optional acpi
 ${OSACPI_MI_DIR}/Osd/OsdDebug.c                optional acpi
 ${OSACPI_MI_DIR}/Osd/OsdHardware.c     optional acpi
@@ -1722,8 +1723,12 @@ ${OSACPI_MI_DIR}/Osd/OsdSynch.c          optional acpi
 ${OSACPI_MI_DIR}/Osd/OsdTable.c                optional acpi
 
 ${OSACPI_MI_DIR}/acpi_asus/acpi_asus.c         optional acpi_asus acpi
-${OSACPI_MI_DIR}/acpi_toshiba/acpi_toshiba.c   optional acpi_toshiba acpi
+${OSACPI_MI_DIR}/acpi_fujitsu/acpi_fujitsu.c   optional acpi_fujitsu acpi
+#${OSACPI_MI_DIR}/acpi_hp/acpi_hp.c            optional acpi_hp acpi
+${OSACPI_MI_DIR}/acpi_panasonic/acpi_panasonic.c optional acpi_panasonic acpi
+${OSACPI_MI_DIR}/acpi_sony/acpi_sony.c         optional acpi_sony acpi
 ${OSACPI_MI_DIR}/acpi_thinkpad/acpi_thinkpad.c optional acpi_thinkpad acpi
+${OSACPI_MI_DIR}/acpi_toshiba/acpi_toshiba.c   optional acpi_toshiba acpi
 ${OSACPI_MI_DIR}/acpi_video/acpi_video.c       optional acpi_video acpi
 ${OSACPI_MI_DIR}/aibs/atk0110.c                        optional aibs acpi
 

diff --git a/sys/config/LINT b/sys/config/LINT
index b01f25d..21f06ae 100644 (file)
--- a/sys/config/LINT
+++ b/sys/config/LINT
@@ -2663,11 +2663,44 @@ options         UBSEC_RNDTEST   # enable rndtest support
 device         glxsb           # Geode LX Security Block
 device         padlock         # hardware crypto/RNG for VIA C3/C7/Eden
 
-device         acpi            # basic ACPI support
-device         acpi_asus       # Asus laptop support
-device         acpi_thinkpad   # ThinkPad support
-device         acpi_toshiba    # Toshiba laptop support
-device         acpi_video      # ACPI video extensions
+#
+# ACPI support using the Intel ACPI Component Architecture reference
+# implementation.
+#
+# ACPI_DEBUG enables the use of the debug.acpi.level and debug.acpi.layer
+# kernel environment variables to select initial debugging levels for the
+# Intel ACPICA code.
+#
+# Note that building ACPI into the kernel is deprecated; the module is
+# normally loaded automatically by the loader.
+
+device         acpi
+options        ACPI_DEBUG
+
+# ACPI Asus Extras (LCD backlight/brightness, video output, etc.)
+device         acpi_asus
+
+# ACPI Fujitsu Extras (Buttons)
+device         acpi_fujitsu
+
+# ACPI extras driver for HP laptops
+#device                acpi_hp
+
+# ACPI Panasonic Extras (LCD backlight/brightness, video output, etc.)
+device         acpi_panasonic
+
+# ACPI Sony extra (LCD brightness)
+device         acpi_sony
+
+# ACPI extras driver for ThinkPad laptops
+device         acpi_thinkpad
+
+# ACPI Toshiba Extras (LCD backlight/brightness, video output, etc.)
+device         acpi_toshiba
+
+# ACPI Video Extensions (LCD backlight/brightness, video output, etc.)
+device         acpi_video
+
 device         aibs            # ASUSTeK AI Booster (ACPI ASOC ATK0110)
 device         pmtimer         # adjust the system clock after resume
 
@@ -2722,7 +2755,6 @@ options           DEBUG_PCTRACK
 # More undocumented options for linting.
 # Note that documenting these are not considered an affront.
 
-options        ACPI_DEBUG
 #options       ACPI_NO_SEMAPHORES
 options        AHC_DUMP_EEPROM
 #options       BKTR_ALLOC_PAGES=xxx