diff options
| author |   Len Brown <len.brown@intel.com> | 2006-07-09 22:09:57 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-07-09 22:09:57 -0400 |
| commit | 8d7bff6c0896feba2fbd5ce37062c212aee13870 (patch) | |
| tree | 2bfde8445b61cc573c12c44b074ed9bc79e100dd /drivers/acpi | |
| parent | Revert "Revert "ACPI: dock driver"" (diff) | |
| download | linux-dev-8d7bff6c0896feba2fbd5ce37062c212aee13870.tar.xz linux-dev-8d7bff6c0896feba2fbd5ce37062c212aee13870.zip | |
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/Kconfig | 4 |
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 config ACPI_DOCK tristate "Dock" - depends on !ACPI_IBM_DOCK - default y + depends on EXPERIMENTAL help This driver adds support for ACPI controlled docking stations @@ -214,6 +213,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. |