[PATCH] make drivers/md/dm-snap.c:ksnapd static

[powerpc.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 2b2fbec..0f9d4be 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -107,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


@@ -133,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


@@ -161,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


@@ -207,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.


@@ -247,7 +253,7 @@ config ACPI_CUSTOM_DSDT
        depends on !STANDALONE
        default n 
        help
        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
          If you don't know what that is, say N.
 
 config ACPI_CUSTOM_DSDT_FILE


@@ -304,7 +310,7 @@ config X86_PM_TIMER
          The Power Management Timer is available on all ACPI-capable,
          in most cases even if ACPI is unusable or blacklisted.
 
          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.
          like aggressive processor idling, throttling, frequency and/or
          voltage scaling, unlike the commonly used Time Stamp Counter
          (TSC) timing source.


@@ -328,7 +334,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


@@ -339,12 +345,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 
          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 
          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
 endif  # ACPI
 
 endmenu