Pull remove-hotkey into release branch

[powerpc.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 5c087a5..e942ffe 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


@@ -12,6 +13,7 @@ config ACPI
        depends on IA64 || X86
        depends on PCI
        depends on PM
        depends on IA64 || X86
        depends on PCI
        depends on PM

+       select PNP

        default y
        ---help---
          Advanced Configuration and Power Interface (ACPI) support for 
        default y
        ---help---
          Advanced Configuration and Power Interface (ACPI) support for 


@@ -131,15 +133,6 @@ config ACPI_VIDEO
          Note that this is an ref. implementation only.  It may or may not work
          for your integrated video device.
 
          Note that this is an ref. implementation only.  It may or may not work
          for your integrated video device.
 

-config ACPI_HOTKEY
-       tristate "Generic Hotkey (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
-       depends on X86
-       default n
-       help
-         Experimental consolidated hotkey driver.
-         If you are unsure, say N.
-

 config ACPI_FAN
        tristate "Fan"
        default y
 config ACPI_FAN
        tristate "Fan"
        default y


@@ -207,19 +200,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