diff options
| author | Len Brown <len.brown@intel.com> | 2006-07-10 02:39:33 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-07-10 02:39:33 -0400 |
| commit | dece75b3a288fa49b3aab685543ec2f5c94b8cfc (patch) | |
| tree | 42b4871522182106d06061923fe9e567ac2e10db /drivers/acpi/Kconfig | |
| parent | 1a39ed5888a8336ed2762d5b367195b14b878850 (diff) | |
| parent | 8d7bff6c0896feba2fbd5ce37062c212aee13870 (diff) | |
Pull dock into test branch
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 89eacd1bfeeb..56c5ba874623 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -132,6 +132,12 @@ 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 EXPERIMENTAL + help + This driver adds support for ACPI controlled docking stations + config ACPI_PROCESSOR tristate "Processor" default y @@ -206,6 +212,7 @@ config ACPI_IBM config ACPI_IBM_DOCK bool "Legacy Docking Station Support" depends on ACPI_IBM + depends on ACPI_DOCK=n default n ---help--- Allows the ibm_acpi driver to handle docking station events. |