fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 33e2ca8..2ed995d 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
-       select PM
-       select PCI
-
+       depends on PCI
+       depends on PM || XEN
        default y
        ---help---
          Advanced Configuration and Power Interface (ACPI) support for 
@@ -46,7 +45,7 @@ if ACPI
 
 config ACPI_SLEEP
        bool "Sleep States"
-       depends on X86 && (!SMP || SUSPEND_SMP)
+       depends on X86 && (!SMP || SUSPEND_SMP) && !XEN
        depends on PM
        default y
        ---help---
@@ -98,6 +97,7 @@ config ACPI_BATTERY
 
 config ACPI_BUTTON
        tristate "Button"
+       depends on INPUT
        default y
        help
          This driver handles events on the power, sleep and lid buttons.
@@ -108,7 +108,6 @@ 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
@@ -134,6 +133,12 @@ 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
@@ -162,12 +167,13 @@ 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
         tristate "ASUS/Medion Laptop Extras"
        depends on X86
+       select BACKLIGHT_CLASS_DEVICE
         ---help---
           This driver provides support for extra features of ACPI-compatible
           ASUS laptops. As some of Medion laptops are made by ASUS, it may also
@@ -196,6 +202,7 @@ config ACPI_ASUS
 config ACPI_IBM
        tristate "IBM ThinkPad Laptop Extras"
        depends on X86
+       select BACKLIGHT_CLASS_DEVICE
        ---help---
          This is a Linux ACPI driver for the IBM ThinkPad laptops. It adds
          support for Fn-Fx key combinations, Bluetooth control, video
@@ -205,9 +212,23 @@ config ACPI_IBM
 
          If you have an IBM ThinkPad laptop, say Y or M here.
 
+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.
+         This support is obsoleted by CONFIG_HOTPLUG_PCI_ACPI.  It will
+         allow locking and removing the laptop from the docking station,
+         but will not properly connect PCI devices.
+
+         If you are not sure, say N here.
+
 config ACPI_TOSHIBA
        tristate "Toshiba Laptop Extras"
        depends on X86
+       select BACKLIGHT_CLASS_DEVICE
        ---help---
          This driver adds support for access to certain system settings
          on "legacy free" Toshiba laptops.  These laptops can be recognized by
@@ -236,7 +257,7 @@ config ACPI_CUSTOM_DSDT
        depends on !STANDALONE
        default n 
        help
-         Thist option is to load a custom ACPI DSDT
+         This option is to load a custom ACPI DSDT
          If you don't know what that is, say N.
 
 config ACPI_CUSTOM_DSDT_FILE
@@ -244,7 +265,8 @@ config ACPI_CUSTOM_DSDT_FILE
        depends on ACPI_CUSTOM_DSDT
        default ""
        help
-         Enter the full path name to the file wich includes the AmlCode declaration.
+         Enter the full path name to the file which includes the AmlCode
+         declaration.
 
 config ACPI_BLACKLIST_YEAR
        int "Disable ACPI for systems before Jan 1st this year" if X86_32
@@ -287,12 +309,13 @@ config ACPI_SYSTEM
 config X86_PM_TIMER
        bool "Power Management Timer Support" if EMBEDDED
        depends on X86
+       depends on !XEN
        default y
        help
          The Power Management Timer is available on all ACPI-capable,
          in most cases even if ACPI is unusable or blacklisted.
 
-         This timing source is not affected by powermanagement features
+         This timing source is not affected by power management features
          like aggressive processor idling, throttling, frequency and/or
          voltage scaling, unlike the commonly used Time Stamp Counter
          (TSC) timing source.
@@ -327,12 +350,23 @@ config ACPI_HOTPLUG_MEMORY
          Enabling this driver assumes that your platform hardware
          and firmware have support for hot-plugging physical memory. If
          your system does not support physically adding or ripping out 
-         memory DIMMs at some platfrom defined granularity (individually 
+         memory DIMMs at some platform defined granularity (individually 
          or as a bank) at runtime, then you need not enable this driver.
 
          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