[PATCH] acpi: remove dock event handling from ibm_acpi

Remove dock station support from ibm_acpi by default.  This support has
been put into acpiphp instead.  Allow ibm_acpi to continue to provide
docking station support via config option for laptops/docking stations
that are not supported by acpiphp.

Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 33e2ca847a26..82710ae39228 100644
--- 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