Pull video into test branch

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

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 0f9d4be7ed758814ba7c9a3e63d8620998609e04..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.


@@ -106,7 +107,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


@@ -172,6 +173,7 @@ config ACPI_NUMA
 config ACPI_ASUS
         tristate "ASUS/Medion Laptop Extras"
        depends on X86
 config ACPI_ASUS
         tristate "ASUS/Medion Laptop Extras"
        depends on X86

+       select BACKLIGHT_CLASS_DEVICE

         ---help---
           This driver provides support for extra features of ACPI-compatible
           ASUS laptops. As some of Medion laptops are made by ASUS, it may also
         ---help---
           This driver provides support for extra features of ACPI-compatible
           ASUS laptops. As some of Medion laptops are made by ASUS, it may also


@@ -200,6 +202,7 @@ config ACPI_ASUS
 config ACPI_IBM
        tristate "IBM ThinkPad Laptop Extras"
        depends on X86
 config ACPI_IBM
        tristate "IBM ThinkPad Laptop Extras"
        depends on X86

+       select BACKLIGHT_CLASS_DEVICE

        ---help---
          This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds
          support for Fn-Fx key combinations, Bluetooth control, video
        ---help---
          This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds
          support for Fn-Fx key combinations, Bluetooth control, video


@@ -225,6 +228,7 @@ config ACPI_IBM_DOCK
 config ACPI_TOSHIBA
        tristate "Toshiba Laptop Extras"
        depends on X86
 config ACPI_TOSHIBA
        tristate "Toshiba Laptop Extras"
        depends on X86

+       select BACKLIGHT_CLASS_DEVICE

        ---help---
          This driver adds support for access to certain system settings
          on "legacy free" Toshiba laptops.  These laptops can be recognized by
        ---help---
          This driver adds support for access to certain system settings
          on "legacy free" Toshiba laptops.  These laptops can be recognized by