x86: enable memory tester support on 32-bit

[safe/jmp/linux-2.6] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index fbcaa06..735f5ea 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -4,8 +4,6 @@
 
 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
@@ -140,6 +138,7 @@ config ACPI_VIDEO
        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
@@ -151,6 +150,7 @@ config ACPI_VIDEO
 
 config ACPI_FAN
        tristate "Fan"
+       select THERMAL
        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"
+       select THERMAL
        default y
        help
          This driver installs ACPI as the idle handler for Linux, and uses
@@ -300,17 +301,6 @@ config ACPI_CUSTOM_DSDT
        bool
        default ACPI_CUSTOM_DSDT_FILE != ""
 
-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 you are not using this feature now, but may use it later,
-         it is safe to say Y here.
-
 config ACPI_BLACKLIST_YEAR
        int "Disable ACPI for systems before Jan 1st this year" if X86_32
        default 0
@@ -346,6 +336,15 @@ config ACPI_EC
          the battery and thermal drivers.  If you are compiling for a 
          mobile system, say Y.
 
+config ACPI_PCI_SLOT
+       tristate "PCI slot detection driver"
+       default n
+       help
+         This driver will attempt to discover all PCI slots in your system,
+         and creates entries in /sys/bus/pci/slots/. This feature can
+         help you correlate PCI bus addresses with the physical geography
+         of your slots. If you are unsure, say N.
+
 config ACPI_POWER
        bool
        default y