Merge branch 'x86/generalize-visws' into x86/core

[linux-2.6] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index b4f5e85428294eed21bb8f342af5a7a7c3fac87b..bba867391a85bff4c08f9e61632026084cf59cea 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -4,8 +4,6 @@
 
 menuconfig ACPI
        bool "ACPI (Advanced Configuration and Power Interface) Support"
 
 menuconfig ACPI
        bool "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 PCI
        depends on !IA64_HP_SIM
        depends on IA64 || X86
        depends on PCI


@@ -140,6 +138,7 @@ config ACPI_VIDEO
        tristate "Video"
        depends on X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL
        depends on INPUT
        tristate "Video"
        depends on X86 && BACKLIGHT_CLASS_DEVICE && VIDEO_OUTPUT_CONTROL
        depends on INPUT

+       select THERMAL

        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


@@ -151,6 +150,7 @@ config ACPI_VIDEO
 
 config ACPI_FAN
        tristate "Fan"
 
 config ACPI_FAN
        tristate "Fan"

+       select THERMAL

        default y
        help
          This driver adds support for ACPI fan devices, allowing user-mode 
        default y
        help
          This driver adds support for ACPI fan devices, allowing user-mode 


@@ -172,6 +172,7 @@ config ACPI_BAY
 
 config ACPI_PROCESSOR
        tristate "Processor"
 
 config ACPI_PROCESSOR
        tristate "Processor"

+       select THERMAL

        default y
        help
          This driver installs ACPI as the idle handler for Linux, and uses
        default y
        help
          This driver installs ACPI as the idle handler for Linux, and uses