Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...

[~andy/linux] / drivers / pci / Kconfig

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index b1ecefa2a23dac481b77c06e1090a4ef40daa171..7858a117e80b04aab04bd112ed383a66d2e40a40 100644 (file)
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -21,17 +21,6 @@ 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_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"
        depends on PCI && DEBUG_KERNEL