summaryrefslogtreecommitdiff
path: root/drivers/acpi/Kconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-07-09 17:22:28 -0400
committerLen Brown <len.brown@intel.com>2006-07-09 17:22:28 -0400
commitc8f7a62cdde461914c6457d5f4362538ed810bf4 (patch)
tree62f8cc2dc2b1c9abb6364b16f3b218a04d121f3e /drivers/acpi/Kconfig
parent953969ddf5b049361ed1e8471cc43dc4134d2a6f (diff)
downloadlwn-c8f7a62cdde461914c6457d5f4362538ed810bf4.tar.gz
lwn-c8f7a62cdde461914c6457d5f4362538ed810bf4.zip
Revert "Revert "ACPI: dock driver""
This reverts 953969ddf5b049361ed1e8471cc43dc4134d2a6f commit.
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r--drivers/acpi/Kconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 290c767dd77f..fef7bab12244 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -133,6 +133,13 @@ config ACPI_FAN
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