Merge branch 'master' into for-linus

[pandora-kernel.git] / drivers / pci / Kconfig

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index b1ecefa..34ef70d 100644 (file)
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -19,18 +19,7 @@ config PCI_MSI
           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
-       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_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.
+          If you don't know what to do here, say Y.
 
 config PCI_DEBUG
        bool "PCI Debugging"