Merge branch 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mv-sheeva.git] / drivers / pci / Kconfig

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index fdc864f9cf233d5134803593640f49c3ed0b1ccf..b1ecefa2a23dac481b77c06e1090a4ef40daa171 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"
@@ -69,3 +69,10 @@ config PCI_IOV
          physical resources.
 
          If unsure, say N.
+
+config PCI_IOAPIC
+       bool
+       depends on PCI
+       depends on ACPI
+       depends on HOTPLUG
+       default y