Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

[linux-2.6] / drivers / pci / Kconfig

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 7f31991772ea4b0b2c51966479642f6e63c66490..4d762fc4878cc0d328121185cf80c356a7f4f6b6 100644 (file)
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -11,41 +11,11 @@ config PCI_MSI
           generate an interrupt using an inbound Memory Write on its
           PCI bus instead of asserting a device IRQ pin.
 
-          If you don't know what to do here, say N.
-
-config PCI_LEGACY_PROC
-       bool "Legacy /proc/pci interface"
-       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.
-
-config PCI_NAMES
-       bool "PCI device name database"
-       depends on PCI
-       ---help---
-         By default, the kernel contains a database of all known PCI device
-         names to make the information in /proc/pci, /proc/ioports and
-         similar files comprehensible to the user. 
+          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.
 
-         This database increases size of the kernel image by about 80KB. This 
-         memory is freed after the system boots up if CONFIG_HOTPLUG is not set.
-
-         Anyway, if you are building an installation floppy or kernel for an 
-         embedded system where kernel image size really matters, you can disable 
-         this feature and you'll get device ID numbers instead of names.
-
-         When in doubt, say Y.
+          If you don't know what to do here, say N.
 
 config PCI_DEBUG
        bool "PCI Debugging"