aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/Kconfig')
-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.