Pull remove-hotkey into release branch

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

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 20eacc2c9e0e5223f27d9f979672a5ed031b350b..e942ffe8b57ee4c9a13a447bf205e3939815dfcc 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -13,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 


@@ -132,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