This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 0e37df0..96e4faf 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -110,21 +110,6 @@ 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
@@ -191,20 +176,6 @@ 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 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
@@ -235,7 +206,7 @@ config ACPI_TOSHIBA
 
 config ACPI_CUSTOM_DSDT
        bool "Include Custom DSDT"
-       depends on ACPI_INTERPRETER && !STANDALONE
+       depends on X86 && ACPI_INTERPRETER && !STANDALONE
        default n 
        help
          Thist option is to load a custom ACPI DSDT