PCI: Convert ioapic to be builtin only, not modular

Convert pci/ioapic.c to be builtin only, with no module option, so we can
support IO-APIC hotplug.  Also make it depend on X86_IO_APIC.

[bhelgaas: changelog]
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index b6a99f7a9b20786d3ead94f24f6afd1754808e91..893503fa17821fcd5aa7fc2d7a207531bac44aaa 100644 (file)
--- 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 50ce6809829836c38d4aedfa58aeb642b126d9df..2c2930ea06ad714d26b954d49bf14aa5eacae02d 100644 (file)
--- 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");