netfilter: nf_conntrack: restrict runtime expect hashsize modifications

[safe/jmp/linux-2.6] / drivers / pci / Kconfig

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 2a4501d..b1ecefa 100644 (file)
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -27,10 +27,10 @@ config PCI_LEGACY
        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.
+         pci_find_device() API.  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"
@@ -59,3 +59,20 @@ config HT_IRQ
           This allows native hypertransport devices to use interrupts.
 
           If unsure say Y.
+
+config PCI_IOV
+       bool "PCI IOV support"
+       depends on PCI
+       help
+         I/O Virtualization is a PCI feature supported by some devices
+         which allows them to create virtual devices which share their
+         physical resources.
+
+         If unsure, say N.
+
+config PCI_IOAPIC
+       bool
+       depends on PCI
+       depends on ACPI
+       depends on HOTPLUG
+       default y