vserver 1.9.5.x5

[linux-2.6.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 96e4faf..76d3f2b 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -20,7 +20,7 @@ config ACPI
          kernel by about 70K.
 
          Linux ACPI provides a robust functional replacement for several 
-         legacy configuration and power management intefaces, including 
+         legacy configuration and power management interfaces, including
          the Plug-and-Play BIOS specification (PnP BIOS), the 
          MultiProcessor Specification (MPS), and the Advanced Power 
          Management (APM) specification.  If both ACPI and APM support 
@@ -110,6 +110,21 @@ config ACPI_BUTTON
          down the system.  Until then, you can cat it, and see output when
          a button is pressed.
 
+config ACPI_VIDEO
+       tristate "Video"
+       depends on ACPI_INTERPRETER
+       depends on EXPERIMENTAL
+       depends on !IA64_SGI_SN
+       default m
+       help
+         This driver implement the ACPI Extensions For Display Adapters
+         for integrated graphics devices on motherboard, as specified in
+         ACPI 2.0 Specification, Appendix B, allowing to perform some basic
+         control like defining the video POST device, retrieving EDID information
+         or to setup a video output, etc.
+         Note that this is an ref. implementation only.  It may or may not work
+         for your integrated video device.
+
 config ACPI_FAN
        tristate "Fan"
        depends on ACPI_INTERPRETER
@@ -129,6 +144,15 @@ config ACPI_PROCESSOR
          ACPI C2 and C3 processor states to save power, on systems that
          support it.
 
+config ACPI_HOTPLUG_CPU
+       bool "Processor Hotplug (EXPERIMENTAL)"
+       depends on ACPI_PROCESSOR && HOTPLUG_CPU && EXPERIMENTAL
+       depends on !IA64_SGI_SN
+       select ACPI_CONTAINER
+       default n
+        ---help---
+        Select this option if your platform support physical CPU hotplug.
+
 config ACPI_THERMAL
        tristate "Thermal Zone"
        depends on ACPI_PROCESSOR
@@ -143,7 +167,7 @@ config ACPI_NUMA
        bool "NUMA support"
        depends on ACPI_INTERPRETER
        depends on NUMA
-       depends on IA64
+       depends on (IA64 || X86_64)
        default y if IA64_GENERIC || IA64_SGI_SN2
 
 config ACPI_ASUS
@@ -176,6 +200,20 @@ config ACPI_ASUS
           something works not quite as expected, please use the mailing list
           available on the above page (acpi4asus-user@lists.sourceforge.net)
           
+config ACPI_IBM
+       tristate "IBM ThinkPad Laptop Extras"
+       depends on X86
+       depends on ACPI_INTERPRETER
+       default m
+       ---help---
+         This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds
+         support for Fn-Fx key combinations, Bluetooth control, video
+         output switching, ThinkLight control, UltraBay eject and more.
+         For more information about this driver see <file:Documentation/ibm-acpi.txt>
+         and <http://ibm-acpi.sf.net/> .
+
+         If you have an IBM ThinkPad laptop, say Y or M here.
+
 config ACPI_TOSHIBA
        tristate "Toshiba Laptop Extras"
        depends on X86
@@ -206,7 +244,7 @@ config ACPI_TOSHIBA
 
 config ACPI_CUSTOM_DSDT
        bool "Include Custom DSDT"
-       depends on X86 && ACPI_INTERPRETER && !STANDALONE
+       depends on ACPI_INTERPRETER && !STANDALONE
        default n 
        help
          Thist option is to load a custom ACPI DSDT
@@ -221,6 +259,7 @@ config ACPI_CUSTOM_DSDT_FILE
 
 config ACPI_BLACKLIST_YEAR
        int "Disable ACPI for systems before Jan 1st this year"
+       depends on ACPI_INTERPRETER
        default 0
        help
          enter a 4-digit year, eg. 2001 to disable ACPI by default
@@ -296,5 +335,12 @@ config X86_PM_TIMER
          kernel logs, and/or you are using this on a notebook which
          does not yet have an HPET, you should say "Y" here.
 
-endmenu
+config ACPI_CONTAINER
+       tristate "ACPI0004,PNP0A05 and PNP0A06 Container Driver (EXPERIMENTAL)"
+       depends on ACPI && EXPERIMENTAL
+       default (ACPI_HOTPLUG_MEMORY || ACPI_HOTPLUG_CPU || ACPI_HOTPLUG_IO)
+        ---help---
+               This is the ACPI generic container driver which supports
+               ACPI0004, PNP0A05 and PNP0A06 devices
 
+endmenu