Merge master.kernel.org:/home/rmk/linux-2.6-serial

[sfrench/cifs-2.6.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 0cce28c4025b1814a57e467f1bef98e93fdeadce..5cb96300eb0f90ef49e9fb1067d88bc1ca579a42 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -205,6 +205,18 @@ 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
+       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
@@ -244,10 +256,11 @@ 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
+       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
@@ -285,9 +298,8 @@ config ACPI_SYSTEM
          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_64
        default y
        help
          The Power Management Timer is available on all ACPI-capable,
@@ -298,9 +310,8 @@ config X86_PM_TIMER
          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)"