From: Kristen Carlson Accardi Change the build options for acpiphp so that it may build without being dependent on the ACPI_DOCK option, but yet does not allow the option of acpiphp being built-in when dock is built as a module. Signed-off-by: Anil S Keshavamurthy Signed-off-by: Kristen Carlson Accardi Signed-off-by: Andrew Morton --- drivers/pci/hotplug/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/pci/hotplug/Kconfig~pci-hotplug-acpiphp-fix-kconfig-for-dock-dependencies-2 drivers/pci/hotplug/Kconfig --- a/drivers/pci/hotplug/Kconfig~pci-hotplug-acpiphp-fix-kconfig-for-dock-dependencies-2 +++ a/drivers/pci/hotplug/Kconfig @@ -76,7 +76,7 @@ config HOTPLUG_PCI_IBM config HOTPLUG_PCI_ACPI tristate "ACPI PCI Hotplug driver" - depends on ACPI_DOCK && HOTPLUG_PCI + depends on (!ACPI_DOCK && ACPI && HOTPLUG_PCI) || (ACPI_DOCK && HOTPLUG_PCI) help Say Y here if you have a system that supports PCI Hotplug using ACPI. _