[PATCH v2 26-1/26] PCI, x86: Make ioapic hotplug support built-in

Yinghai Lu
2013-02-09T00:27:19Z

ioapic hotplug should be built-in by nature.

Also need to make it depends on X86_IO_APIC.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>

---
drivers/pci/Kconfig | 3 ++-
drivers/pci/ioapic.c | 7 -------
2 files changed, 2 insertions(+), 8 deletions(-)

Index: linux-2.6/drivers/pci/Kconfig
===================================================================
--- linux-2.6.orig/drivers/pci/Kconfig
+++ linux-2.6/drivers/pci/Kconfig
@@ -110,10 +110,11 @@ 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 HOTPLUG
+ depends on X86_IO_APIC
default !X86

config PCI_LABEL
Index: linux-2.6/drivers/pci/ioapic.c
===================================================================
--- linux-2.6.orig/drivers/pci/ioapic.c
+++ linux-2.6/drivers/pci/ioapic.c
@@ -130,13 +130,6 @@ static int __init ioapic_init(void)
{
return pci_register_driver(&ioapic_driver);
}
-
-static void __exit ioapic_exit(void)
-{
- pci_unregister_driver(&ioapic_driver);
-}
-
module_init(ioapic_init);
-module_exit(ioapic_exit);

MODULE_LICENSE("GPL");