Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

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

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index f0c8926..2129645 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
 config ACPI
        bool "ACPI Support"
        depends on IA64 || X86

+       depends on PCI

        select PM
        select PM

-       select PCI
-

        default y
        ---help---
          Advanced Configuration and Power Interface (ACPI) support for 
        default y
        ---help---
          Advanced Configuration and Power Interface (ACPI) support for 


@@ -108,7 +107,6 @@ config ACPI_BUTTON
 config ACPI_VIDEO
        tristate "Video"
        depends on X86
 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
        help
          This driver implement the ACPI Extensions For Display Adapters
          for integrated graphics devices on motherboard, as specified in


@@ -134,6 +132,12 @@ config ACPI_FAN
          This driver adds support for ACPI fan devices, allowing user-mode 
          applications to perform basic fan control (on, off, status).
 
          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
 config ACPI_PROCESSOR
        tristate "Processor"
        default y


@@ -162,7 +166,7 @@ config ACPI_THERMAL
 config ACPI_NUMA
        bool "NUMA support"
        depends on NUMA
 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
        default y if IA64_GENERIC || IA64_SGI_SN2
 
 config ACPI_ASUS


@@ -208,6 +212,7 @@ config ACPI_IBM
 config ACPI_IBM_DOCK
        bool "Legacy Docking Station Support"
        depends on 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.
        default n
        ---help---
          Allows the ibm_acpi driver to handle docking station events.


@@ -330,7 +335,7 @@ config ACPI_CONTAINER
 config ACPI_HOTPLUG_MEMORY
        tristate "Memory Hotplug"
        depends on ACPI
 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
        default n
        help
          This driver adds supports for ACPI Memory Hotplug.  This driver


@@ -347,6 +352,17 @@ config ACPI_HOTPLUG_MEMORY
          If one selects "m," this driver can be loaded using the following
          command: 
                $>modprobe acpi_memhotplug 
          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
 endif  # ACPI
 
 endmenu