1 files changed, 20 insertions, 10 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 0cce28c4025b..2b2fbec14540 100644
--- 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
+        depends on PCI
         select PM
-        select PCI
-
         default y
         ---help---
           Advanced Configuration and Power Interface (ACPI) support for 
@@ -205,6 +204,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 +255,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 +297,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 +309,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)"
@@ -318,7 +328,7 @@ config ACPI_CONTAINER
 config ACPI_HOTPLUG_MEMORY
         tristate "Memory Hotplug"
         depends on ACPI
-        depends on MEMORY_HOTPLUG
+        depends on MEMORY_HOTPLUG || X86_64
         default n
         help
           This driver adds supports for ACPI Memory Hotplug.  This driver