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 | |
| parent | c8f7a62cdde461914c6457d5f4362538ed810bf4 (diff) | |
| download | linux-8d7bff6c0896feba2fbd5ce37062c212aee13870.tar.gz linux-8d7bff6c0896feba2fbd5ce37062c212aee13870.tar.xz | |
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>
| -rw-r--r-- | drivers/acpi/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/pci/hotplug/Kconfig | 2 |
2 files changed, 3 insertions, 3 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. diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig index 222a1cc4aa28..d305d212ad6c 100644 --- a/drivers/pci/hotplug/Kconfig +++ b/drivers/pci/hotplug/Kconfig @@ -77,7 +77,7 @@ config HOTPLUG_PCI_IBM config HOTPLUG_PCI_ACPI tristate "ACPI PCI Hotplug driver" - depends on ACPI && HOTPLUG_PCI + depends on ACPI_DOCK && HOTPLUG_PCI help Say Y here if you have a system that supports PCI Hotplug using ACPI. |