vserver 1.9.5.x5

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

diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig
index 9117a95..1a4d4ca 100644 (file)
--- a/drivers/pci/hotplug/Kconfig
+++ b/drivers/pci/hotplug/Kconfig
@@ -3,11 +3,11 @@
 #
 
 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
@@ -134,27 +134,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