commit c8f7a62cdde461914c6457d5f4362538ed810bf4
author Len Brown <len.brown@intel.com> Sun Jul 09 17:22:28 2006 -0400
committer Len Brown <len.brown@intel.com> Sun Jul 09 17:22:28 2006 -0400
tree 62f8cc2dc2b1c9abb6364b16f3b218a04d121f3e
parent 953969ddf5b049361ed1e8471cc43dc4134d2a6f

Revert "Revert "ACPI: dock driver""

This reverts 953969ddf5b049361ed1e8471cc43dc4134d2a6f commit.

drivers/acpi/Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 290c767..fef7bab 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -133,6 +133,13 @@
 	  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 !ACPI_IBM_DOCK
+	default y
+	help
+	  This driver adds support for ACPI controlled docking stations
+
 config ACPI_PROCESSOR
 	tristate "Processor"
 	default y