X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=drivers%2Fpci%2Fhotplug%2FKconfig;h=6e780db9454dfbe2e46186e24d9b01df41e25de9;hb=cab00891c5489cb6d0cde0a55d39bd5f2871fa70;hp=3fae77ffb2fac79d0029ed062114d0293c8dbaf5;hpb=7d450e00711bf8c72fc781677f7abc08d227578e;p=mirror_ubuntu-artful-kernel.git

diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig
index 3fae77ffb2fa..6e780db9454d 100644
--- a/drivers/pci/hotplug/Kconfig
+++ b/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.
@@ -153,18 +153,11 @@ config HOTPLUG_PCI_SHPC_POLL_EVENT_MODE
 
 	  When in doubt, say N.
 
-config HOTPLUG_PCI_SHPC_PHPRM_LEGACY
-	bool "For AMD SHPC only: Use $HRT for resource/configuration"
-	depends on HOTPLUG_PCI_SHPC && !ACPI 
-	help
-	  Say Y here for AMD SHPC. You have to select this option if you are 
-	  using this driver on platform with AMD SHPC.
-
 config HOTPLUG_PCI_RPA
 	tristate "RPA PCI Hotplug driver"
 	depends on HOTPLUG_PCI && PPC_PSERIES && PPC64 && !HOTPLUG_PCI_FAKE
 	help
-	  Say Y here if you have a a RPA system that supports PCI Hotplug.
+	  Say Y here if you have a RPA system that supports PCI Hotplug.
 
 	  To compile this driver as a module, choose M here: the
 	  module will be called rpaphp.