Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / pci / hotplug / Kconfig

diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig
index 9117a95..222a1cc 100644 (file)
--- a/drivers/pci/hotplug/Kconfig
+++ b/drivers/pci/hotplug/Kconfig
@@ -3,16 +3,15 @@
 #
 
 menu "PCI Hotplug Support"
-       depends on HOTPLUG
 
 config HOTPLUG_PCI
        tristate "Support for PCI Hotplug (EXPERIMENTAL)"
        depends on PCI && EXPERIMENTAL
+       select HOTPLUG
        ---help---
          Say Y here if you have a motherboard with a PCI Hotplug controller.
          This allows you to add and remove PCI cards while the machine is
-         powered up and running.  The file system pcihpfs must be mounted
-         in order to interact with any PCI Hotplug controllers.
+         powered up and running.
 
          To compile this driver as a module, choose M here: the
          module will be called pci_hotplug.
@@ -78,7 +77,7 @@ config HOTPLUG_PCI_IBM
 
 config HOTPLUG_PCI_ACPI
        tristate "ACPI PCI Hotplug driver"
-       depends on ACPI_BUS && HOTPLUG_PCI
+       depends on ACPI && HOTPLUG_PCI
        help
          Say Y here if you have a system that supports PCI Hotplug using
          ACPI.
@@ -134,27 +133,6 @@ config HOTPLUG_PCI_CPCI_GENERIC
 
          When in doubt, say N.
 
-config HOTPLUG_PCI_PCIE
-       tristate "PCI Express Hotplug driver"
-       depends on HOTPLUG_PCI
-       help
-         Say Y here if you have a motherboard that supports PCI Express Native
-         Hotplug
-
-         To compile this driver as a module, choose M here: the
-         module will be called pciehp.
-
-         When in doubt, say N.
-
-config HOTPLUG_PCI_PCIE_POLL_EVENT_MODE
-       bool "Use polling mechanism for hot-plug events (for testing purpose)"
-       depends on HOTPLUG_PCI_PCIE
-       help
-         Say Y here if you want to use the polling mechanism for hot-plug 
-         events for early platform testing.
-          
-         When in doubt, say N.
-
 config HOTPLUG_PCI_SHPC
        tristate "SHPC PCI Hotplug driver"
        depends on HOTPLUG_PCI
@@ -178,7 +156,7 @@ config HOTPLUG_PCI_SHPC_POLL_EVENT_MODE
 
 config HOTPLUG_PCI_SHPC_PHPRM_LEGACY
        bool "For AMD SHPC only: Use $HRT for resource/configuration"
-       depends on HOTPLUG_PCI_SHPC && !ACPI_BUS 
+       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.
@@ -208,9 +186,10 @@ config HOTPLUG_PCI_RPA_DLPAR
 
 config HOTPLUG_PCI_SGI
        tristate "SGI PCI Hotplug Support"
-       depends on HOTPLUG_PCI && IA64_SGI_SN2
+       depends on HOTPLUG_PCI && (IA64_SGI_SN2 || IA64_GENERIC)
        help
-         Say Y here if you have an SGI IA64 Altix system.
+         Say Y here if you want to use the SGI Altix Hotplug
+         Driver for PCI devices.
 
          When in doubt, say N.