Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 2129645..f0c8926 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -10,8 +10,9 @@ 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 
@@ -107,6 +108,7 @@ config ACPI_BUTTON
 config ACPI_VIDEO
        tristate "Video"
        depends on X86
+       default y
        help
          This driver implement the ACPI Extensions For Display Adapters
          for integrated graphics devices on motherboard, as specified in
@@ -132,12 +134,6 @@ 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 EXPERIMENTAL
-       help
-         This driver adds support for ACPI controlled docking stations
-
 config ACPI_PROCESSOR
        tristate "Processor"
        default y
@@ -166,7 +162,7 @@ config ACPI_THERMAL
 config ACPI_NUMA
        bool "NUMA support"
        depends on NUMA
-       depends on (X86 || IA64)
+       depends on (IA64 || X86_64)
        default y if IA64_GENERIC || IA64_SGI_SN2
 
 config ACPI_ASUS
@@ -212,7 +208,6 @@ config ACPI_IBM
 config ACPI_IBM_DOCK
        bool "Legacy Docking Station Support"
        depends on ACPI_IBM
-       depends on ACPI_DOCK=n
        default n
        ---help---
          Allows the ibm_acpi driver to handle docking station events.
@@ -335,7 +330,7 @@ config ACPI_CONTAINER
 config ACPI_HOTPLUG_MEMORY
        tristate "Memory Hotplug"
        depends on ACPI
-       depends on MEMORY_HOTPLUG
+       depends on MEMORY_HOTPLUG || X86_64
        default n
        help
          This driver adds supports for ACPI Memory Hotplug.  This driver
@@ -352,17 +347,6 @@ config ACPI_HOTPLUG_MEMORY
          If one selects "m," this driver can be loaded using the following
          command: 
                $>modprobe acpi_memhotplug 
-
-config ACPI_SBS
-       tristate "Smart Battery System (EXPERIMENTAL)"
-       depends on X86 && I2C
-       depends on EXPERIMENTAL
-       help
-         This driver adds support for the Smart Battery System.
-         Depends on I2C (Device Drivers ---> I2C support)
-         A "Smart Battery" is quite old and quite rare compared
-         to today's ACPI "Control Method" battery.
-
 endif  # ACPI
 
 endmenu