Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index c24652d31bf9b6f2fe763ecd20546fe047729e84..bc2652d72fdc79dd97d1b2cd531e272e899caee4 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -10,9 +10,8 @@ menu "ACPI (Advanced Configuration and Power Interface) Support"
 config ACPI
        bool "ACPI Support"
        depends on IA64 || X86
+       depends on PCI
        select PM
-       select PCI
-
        default y
        ---help---
          Advanced Configuration and Power Interface (ACPI) support for 
@@ -134,6 +133,13 @@ config ACPI_FAN
          This driver adds support for ACPI fan devices, allowing user-mode 
          applications to perform basic fan control (on, off, status).
 
+config ACPI_DOCK
+       tristate "Dock"
+       depends on !ACPI_IBM_DOCK
+       default y
+       help
+         This driver adds support for ACPI controlled docking stations
+
 config ACPI_PROCESSOR
        tristate "Processor"
        default y
@@ -162,7 +168,7 @@ config ACPI_THERMAL
 config ACPI_NUMA
        bool "NUMA support"
        depends on NUMA
-       depends on (IA64 || X86_64)
+       depends on (X86 || IA64)
        default y if IA64_GENERIC || IA64_SGI_SN2
 
 config ACPI_ASUS
@@ -329,7 +335,7 @@ config ACPI_CONTAINER
 config ACPI_HOTPLUG_MEMORY
        tristate "Memory Hotplug"
        depends on ACPI
-       depends on MEMORY_HOTPLUG || X86_64
+       depends on MEMORY_HOTPLUG
        default n
        help
          This driver adds supports for ACPI Memory Hotplug.  This driver