MAINTAINER

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

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 2caef098379e42ea1939117f6de36c3864d6f6b0..20eacc2c9e0e5223f27d9f979672a5ed031b350b 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -3,6 +3,7 @@
 #
 
 menu "ACPI (Advanced Configuration and Power Interface) Support"
 #
 
 menu "ACPI (Advanced Configuration and Power Interface) Support"

+       depends on !X86_NUMAQ

        depends on !X86_VISWS
        depends on !IA64_HP_SIM
        depends on IA64 || X86
        depends on !X86_VISWS
        depends on !IA64_HP_SIM
        depends on IA64 || X86


@@ -77,6 +78,20 @@ config ACPI_SLEEP_PROC_SLEEP
          Create /proc/acpi/sleep
          Deprecated by /sys/power/state
 
          Create /proc/acpi/sleep
          Deprecated by /sys/power/state
 

+config ACPI_PROCFS
+       bool "Procfs interface (deprecated)"
+       depends on ACPI
+       default y
+       ---help---
+         Procfs interface for ACPI is made optional for back-compatible.
+         As the same functions are duplicated in sysfs interface
+         and this proc interface will be removed some time later,
+         it's marked as deprecated.
+         ( /proc/acpi/debug_layer && debug_level are deprecated by
+           /sys/module/acpi/parameters/debug_layer && debug_level.
+           /proc/acpi/info is deprecated by
+           /sys/module/acpi/parameters/acpica_version )
+

 config ACPI_AC
        tristate "AC Adapter"
        depends on X86
 config ACPI_AC
        tristate "AC Adapter"
        depends on X86


@@ -107,7 +122,7 @@ config ACPI_BUTTON
 
 config ACPI_VIDEO
        tristate "Video"
 
 config ACPI_VIDEO
        tristate "Video"

-       depends on X86
+       depends on X86 && BACKLIGHT_CLASS_DEVICE

        help
          This driver implement the ACPI Extensions For Display Adapters
          for integrated graphics devices on motherboard, as specified in
        help
          This driver implement the ACPI Extensions For Display Adapters
          for integrated graphics devices on motherboard, as specified in


@@ -140,7 +155,7 @@ config ACPI_DOCK
          This driver adds support for ACPI controlled docking stations
 
 config ACPI_BAY
          This driver adds support for ACPI controlled docking stations
 
 config ACPI_BAY

-       tristate "Removable Drive Bay"
+       tristate "Removable Drive Bay (EXPERIMENTAL)"

        depends on EXPERIMENTAL
        help
          This driver adds support for ACPI controlled removable drive
        depends on EXPERIMENTAL
        help
          This driver adds support for ACPI controlled removable drive


@@ -193,19 +208,22 @@ config ACPI_ASUS
 
          Note: display switching code is currently considered EXPERIMENTAL,
          toying with these values may even lock your machine.
 
          Note: display switching code is currently considered EXPERIMENTAL,
          toying with these values may even lock your machine.

-          
+

           All settings are changed via /proc/acpi/asus directory entries. Owner
           and group for these entries can be set with asus_uid and asus_gid
           parameters.
           All settings are changed via /proc/acpi/asus directory entries. Owner
           and group for these entries can be set with asus_uid and asus_gid
           parameters.

-          
+

           More information and a userspace daemon for handling the extra buttons
           at <http://sourceforge.net/projects/acpi4asus/>.
           More information and a userspace daemon for handling the extra buttons
           at <http://sourceforge.net/projects/acpi4asus/>.

-          
+

           If you have an ACPI-compatible ASUS laptop, say Y or M here. This
           driver is still under development, so if your laptop is unsupported or
           something works not quite as expected, please use the mailing list
           If you have an ACPI-compatible ASUS laptop, say Y or M here. This
           driver is still under development, so if your laptop is unsupported or
           something works not quite as expected, please use the mailing list

-          available on the above page (acpi4asus-user@lists.sourceforge.net)
-          
+          available on the above page (acpi4asus-user@lists.sourceforge.net).
+
+         NOTE: This driver is deprecated and will probably be removed soon,
+         use asus-laptop instead.
+

 config ACPI_IBM
        tristate "IBM ThinkPad Laptop Extras"
        depends on X86
 config ACPI_IBM
        tristate "IBM ThinkPad Laptop Extras"
        depends on X86