Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Update documentation 00-INDEX file
  PCI: Convert ioapic to be builtin only, not modular

3 files changed, 9 insertions, 4 deletions

diff --git a/Documentation/PCI/00-INDEX b/Documentation/PCI/00-INDEX
index 812b17fe3ed0..147231f1613e 100644
--- a/Documentation/PCI/00-INDEX
+++ b/Documentation/PCI/00-INDEX
@@ -2,12 +2,12 @@
         - this file
 MSI-HOWTO.txt
         - the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ.
-PCI-DMA-mapping.txt
-        - info for PCI drivers using DMA portably across all platforms
 PCIEBUS-HOWTO.txt
         - a guide describing the PCI Express Port Bus driver
 pci-error-recovery.txt
         - info on PCI error recovery
+pci-iov-howto.txt
+        - the PCI Express I/O Virtualization HOWTO
 pci.txt
         - info on the PCI subsystem for device driver authors
 pcieaer-howto.txt
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index b6a99f7a9b20..893503fa1782 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -105,9 +105,10 @@ config PCI_PASID
           If unsure, say N.
 
 config PCI_IOAPIC
-        tristate "PCI IO-APIC hotplug support" if X86
+        bool "PCI IO-APIC hotplug support" if X86
         depends on PCI
         depends on ACPI
+        depends on X86_IO_APIC
         default !X86
 
 config PCI_LABEL
diff --git a/drivers/pci/ioapic.c b/drivers/pci/ioapic.c
index 50ce68098298..2c2930ea06ad 100644
--- a/drivers/pci/ioapic.c
+++ b/drivers/pci/ioapic.c
@@ -113,6 +113,10 @@ static struct pci_driver ioapic_driver = {
         .remove         = ioapic_remove,
 };
 
-module_pci_driver(ioapic_driver);
+static int __init ioapic_init(void)
+{
+        return pci_register_driver(&ioapic_driver);
+}
+module_init(ioapic_init);
 
 MODULE_LICENSE("GPL");