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 f187fd8..b1ecefa 100644 (file)
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -1,34 +1,36 @@
 #
 # PCI configuration
 #
+config ARCH_SUPPORTS_MSI
+       bool
+       default n
+
 config PCI_MSI
        bool "Message Signaled Interrupts (MSI and MSI-X)"
        depends on PCI
-       depends on (X86_LOCAL_APIC && X86_IO_APIC) || IA64
+       depends on ARCH_SUPPORTS_MSI
        help
           This allows device drivers to enable MSI (Message Signaled
           Interrupts).  Message Signaled Interrupts enable a device to
           generate an interrupt using an inbound Memory Write on its
           PCI bus instead of asserting a device IRQ pin.
 
+          Use of PCI MSI interrupts can be disabled at kernel boot time
+          by using the 'pci=nomsi' option.  This disables MSI for the
+          entire system.
+
           If you don't know what to do here, say N.
 
-config PCI_LEGACY_PROC
-       bool "Legacy /proc/pci interface"
+config PCI_LEGACY
+       bool "Enable deprecated pci_find_* API"
        depends on PCI
-       ---help---
-         This feature enables a procfs file -- /proc/pci -- that provides a 
-         summary of PCI devices in the system. 
-
-         This feature has been deprecated as of v2.5.53, in favor of using the 
-         tool lspci(8). This feature may be removed at a future date. 
-
-         lspci can provide the same data, as well as much more. lspci is a part of
-         the pci-utils package, which should be installed by your distribution. 
-         See <file:Documentation/Changes> for information on where to get the latest
-         version. 
-
-         When in doubt, say N.
+       default y
+       help
+         Say Y here if you want to include support for the deprecated
+         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"
@@ -40,3 +42,37 @@ 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
+       depends on PCI && X86_LOCAL_APIC && X86_IO_APIC
+       help
+          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