ACPI: EC: Remove unused variables and duplicated code

[safe/jmp/linux-2.6] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 6d61945..0f9d4be 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


@@ -205,6 +209,19 @@ config ACPI_IBM
 
          If you have an IBM ThinkPad laptop, say Y or M here.
 
 
          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
 config ACPI_TOSHIBA
        tristate "Toshiba Laptop Extras"
        depends on X86


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


@@ -244,10 +261,11 @@ config ACPI_CUSTOM_DSDT_FILE
        depends on ACPI_CUSTOM_DSDT
        default ""
        help
        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
 
 config ACPI_BLACKLIST_YEAR

-       int "Disable ACPI for systems before Jan 1st this year" if X86
+       int "Disable ACPI for systems before Jan 1st this year" if X86_32

        default 0
        help
          enter a 4-digit year, eg. 2001 to disable ACPI by default
        default 0
        help
          enter a 4-digit year, eg. 2001 to disable ACPI by default


@@ -267,7 +285,6 @@ config ACPI_DEBUG
 
 config ACPI_EC
        bool
 
 config ACPI_EC
        bool

-       depends on X86

        default y
        help
          This driver is required on some systems for the proper operation of
        default y
        help
          This driver is required on some systems for the proper operation of


@@ -286,22 +303,20 @@ config ACPI_SYSTEM
          dump your ACPI DSDT table using /proc/acpi/dsdt.
 
 config X86_PM_TIMER
          dump your ACPI DSDT table using /proc/acpi/dsdt.
 
 config X86_PM_TIMER

-       bool "Power Management Timer Support"
+       bool "Power Management Timer Support" if EMBEDDED

        depends on X86
        depends on X86

-       depends on !X86_64

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

-         So, if you see messages like 'Losing too many ticks!' in the
-         kernel logs, and/or you are using this on a notebook which
-         does not yet have an HPET, you should say "Y" here.
+         You should nearly always say Y here because many modern
+         systems require this timer. 

 
 config ACPI_CONTAINER
        tristate "ACPI0004,PNP0A05 and PNP0A06 Container Driver (EXPERIMENTAL)"
 
 config ACPI_CONTAINER
        tristate "ACPI0004,PNP0A05 and PNP0A06 Container Driver (EXPERIMENTAL)"


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