From 370099fca76a57aeeb74a19966882f5ed9d1d643 Mon Sep 17 00:00:00 2001
From: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Date: Wed, 26 Jul 2006 13:32:00 -0400
Subject: [PATCH] --- yaml --- r: 33422 b: refs/heads/master c:
 b5240b32b9b2b75917c478d768191862a2b190cc h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/pci/hotplug/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bbabe56f3f9c..79b3d5c2cf7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07dd4855e7fffeb50565826e5e736509ee8f6129
+refs/heads/master: b5240b32b9b2b75917c478d768191862a2b190cc
diff --git a/trunk/drivers/pci/hotplug/Kconfig b/trunk/drivers/pci/hotplug/Kconfig
index 3fae77ffb2fa..1c363d814279 100644
--- a/trunk/drivers/pci/hotplug/Kconfig
+++ b/trunk/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.