Merge branches 'irq/sparseirq' and 'linus' into irq/core

[linux-2.6-omap-h63xx.git] / drivers / pci / Kconfig

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 7a1d6d51283747825aeb9eba5faca5f6440e5cf9..2a4501dd251503ddb6d5fefd78737b4c97425452 100644 (file)
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -21,6 +21,17 @@ config PCI_MSI
 
           If you don't know what to do here, say N.
 
+config PCI_LEGACY
+       bool "Enable deprecated pci_find_* API"
+       depends on PCI
+       default y
+       help
+         Say Y here if you want to include support for the deprecated
+         pci_find_slot() and pci_find_device() APIs.  Most drivers have
+         been converted over to using the proper hotplug APIs, so this
+         option serves to include/exclude only a few drivers that are
+         still using this API.
+
 config PCI_DEBUG
        bool "PCI Debugging"
        depends on PCI && DEBUG_KERNEL
@@ -31,6 +42,15 @@ config PCI_DEBUG
 
          When in doubt, say N.
 
+config PCI_STUB
+       tristate "PCI Stub driver"
+       depends on PCI
+       help
+         Say Y or M here if you want be able to reserve a PCI device
+         when it is going to be assigned to a guest operating system.
+
+         When in doubt, say N.
+
 config HT_IRQ
        bool "Interrupts on hypertransport devices"
        default y