Pull video into test branch

[linux-drm-fsl-dcu.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index e3f77e2ce25fca95f34b16b1f234e0b495870694..50e295b08c94dfb23f266e83478455d4a3449cc0 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -11,7 +11,7 @@ config ACPI
        bool "ACPI Support"
        depends on IA64 || X86
        depends on PCI
        bool "ACPI Support"
        depends on IA64 || X86
        depends on PCI

-       select PM
+       depends on PM

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


@@ -97,6 +97,7 @@ config ACPI_BATTERY
 
 config ACPI_BUTTON
        tristate "Button"
 
 config ACPI_BUTTON
        tristate "Button"

+       depends on INPUT

        default y
        help
          This driver handles events on the power, sleep and lid buttons.
        default y
        help
          This driver handles events on the power, sleep and lid buttons.


@@ -224,17 +225,6 @@ config ACPI_IBM_DOCK
 
          If you are not sure, say N here.
 
 
          If you are not sure, say N here.
 

-config ACPI_IBM_BAY
-       bool "Legacy Removable Bay Support"
-       depends on ACPI_IBM
-       depends on ACPI_BAY=n
-       default n
-       ---help---
-         Allows the ibm_acpi driver to handle removable bays.
-         This support is obsoleted by CONFIG_ACPI_BAY.
-
-         If you are not sure, say N here.
-

 config ACPI_TOSHIBA
        tristate "Toshiba Laptop Extras"
        depends on X86
 config ACPI_TOSHIBA
        tristate "Toshiba Laptop Extras"
        depends on X86