diff options
author | Len Brown <len.brown@intel.com> | 2006-07-09 17:22:28 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-07-09 17:22:28 -0400 |
commit | c8f7a62cdde461914c6457d5f4362538ed810bf4 (patch) | |
tree | 62f8cc2dc2b1c9abb6364b16f3b218a04d121f3e /drivers/acpi/Kconfig | |
parent | 953969ddf5b049361ed1e8471cc43dc4134d2a6f (diff) |
Revert "Revert "ACPI: dock driver""
This reverts 953969ddf5b049361ed1e8471cc43dc4134d2a6f commit.
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r-- | drivers/acpi/Kconfig | 7 |
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 | |||
133 | This driver adds support for ACPI fan devices, allowing user-mode | 133 | This driver adds support for ACPI fan devices, allowing user-mode |
134 | applications to perform basic fan control (on, off, status). | 134 | applications to perform basic fan control (on, off, status). |
135 | 135 | ||
136 | config ACPI_DOCK | ||
137 | tristate "Dock" | ||
138 | depends on !ACPI_IBM_DOCK | ||
139 | default y | ||
140 | help | ||
141 | This driver adds support for ACPI controlled docking stations | ||
142 | |||
136 | config ACPI_PROCESSOR | 143 | config ACPI_PROCESSOR |
137 | tristate "Processor" | 144 | tristate "Processor" |
138 | default y | 145 | default y |