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 f688c214be0c67110df1d039be5566d3c7f59bfe..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


@@ -283,34 +284,22 @@ config ACPI_TOSHIBA
          If you have a legacy free Toshiba laptop (such as the Libretto L1
          series), say Y.
 
          If you have a legacy free Toshiba laptop (such as the Libretto L1
          series), say Y.
 

-config ACPI_CUSTOM_DSDT
-       bool "Include Custom DSDT"
+config ACPI_CUSTOM_DSDT_FILE
+       string "Custom DSDT Table file to include"
+       default ""

        depends on !STANDALONE
        depends on !STANDALONE

-       default n 

        help
          This option supports a custom DSDT by linking it into the kernel.
          See Documentation/acpi/dsdt-override.txt
 
        help
          This option supports a custom DSDT by linking it into the kernel.
          See Documentation/acpi/dsdt-override.txt
 

-         If unsure, say N.
-
-config ACPI_CUSTOM_DSDT_FILE
-       string "Custom DSDT Table file to include"
-       depends on ACPI_CUSTOM_DSDT
-       default ""
-       help

          Enter the full path name to the file which includes the AmlCode
          declaration.
 
          Enter the full path name to the file which includes the AmlCode
          declaration.
 

-config ACPI_CUSTOM_DSDT_INITRD
-       bool "Read Custom DSDT from initramfs"
-       depends on BLK_DEV_INITRD
-       default n
-       help
-         This option supports a custom DSDT by optionally loading it from initrd.
-         See Documentation/acpi/dsdt-override.txt
+         If unsure, don't enter a file name.

 
 

-         If you are not using this feature now, but may use it later,
-         it is safe to say Y here.
+config ACPI_CUSTOM_DSDT
+       bool
+       default ACPI_CUSTOM_DSDT_FILE != ""

 
 config ACPI_BLACKLIST_YEAR
        int "Disable ACPI for systems before Jan 1st this year" if X86_32
 
 config ACPI_BLACKLIST_YEAR
        int "Disable ACPI for systems before Jan 1st this year" if X86_32