The patch titled
pci/hotplug acpiphp: fix Kconfig for Dock dependencies
has been added to the -mm tree. Its filename is
pci-hotplug-acpiphp-fix-kconfig-for-dock-dependencies-2.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: pci/hotplug acpiphp: fix Kconfig for Dock dependencies
From: Kristen Carlson Accardi <kristen.c.accardi@xxxxxxxxx>
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 <anil.s.keshavamurthy@xxxxxxxxx>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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.
_
Patches currently in -mm which might be from kristen.c.accardi@xxxxxxxxx are
pci-hotplug-acpiphp-fix-kconfig-for-dock-dependencies-2.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
