aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-07-09 22:09:57 -0400
committerLen Brown <len.brown@intel.com>2006-07-09 22:09:57 -0400
commit8d7bff6c0896feba2fbd5ce37062c212aee13870 (patch)
tree2bfde8445b61cc573c12c44b074ed9bc79e100dd /drivers/acpi
parentc8f7a62cdde461914c6457d5f4362538ed810bf4 (diff)
ACPI: ACPI_DOCK Kconfig
HOTPLUG_PCI_ACPI depends on ACPI_DOCK ACPI_IBM_DOCK depends on ACPI_DOCK=n ACPI_DOCK is EXPERIMENTAL, though that doesn't seem to mean much Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index fef7bab12244..82289f1364f2 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -135,8 +135,7 @@ config ACPI_FAN
135 135
136config ACPI_DOCK 136config ACPI_DOCK
137 tristate "Dock" 137 tristate "Dock"
138 depends on !ACPI_IBM_DOCK 138 depends on EXPERIMENTAL
139 default y
140 help 139 help
141 This driver adds support for ACPI controlled docking stations 140 This driver adds support for ACPI controlled docking stations
142 141
@@ -214,6 +213,7 @@ config ACPI_IBM
214config ACPI_IBM_DOCK 213config ACPI_IBM_DOCK
215 bool "Legacy Docking Station Support" 214 bool "Legacy Docking Station Support"
216 depends on ACPI_IBM 215 depends on ACPI_IBM
216 depends on ACPI_DOCK=n
217 default n 217 default n
218 ---help--- 218 ---help---
219 Allows the ibm_acpi driver to handle docking station events. 219 Allows the ibm_acpi driver to handle docking station events.