[PATCH 1 of 2] PCI Hotplug Config.in fix

[PATCH 1 of 2] PCI Hotplug Config.in fix

[Greg KH]

Hi,

Here's a patch against 2.4.19-pre7 that fixes the pci hotplug Config.in
file so as to not build the IBM PCI Hotplug driver unless
CONFIG_X86_IO_APIC is enabled.

thanks,

greg k-h


diff -Nru a/drivers/hotplug/Config.in b/drivers/hotplug/Config.in
--- a/drivers/hotplug/Config.in	Thu Apr 18 09:15:02 2002
+++ b/drivers/hotplug/Config.in	Thu Apr 18 09:15:02 2002
@@ -8,7 +8,9 @@
 
 dep_tristate '  Compaq PCI Hotplug driver' CONFIG_HOTPLUG_PCI_COMPAQ $CONFIG_HOTPLUG_PCI $CONFIG_X86
 dep_mbool '    Save configuration into NVRAM on Compaq servers' CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM $CONFIG_HOTPLUG_PCI_COMPAQ
-dep_tristate '  IBM PCI Hotplug driver' CONFIG_HOTPLUG_PCI_IBM $CONFIG_HOTPLUG_PCI $CONFIG_X86_IO_APIC $CONFIG_X86
+if [ "$CONFIG_X86_IO_APIC" = "y" ]; then
+   dep_tristate '  IBM PCI Hotplug driver' CONFIG_HOTPLUG_PCI_IBM $CONFIG_HOTPLUG_PCI $CONFIG_X86_IO_APIC $CONFIG_X86
+fi
 dep_tristate '  ACPI PCI Hotplug driver' CONFIG_HOTPLUG_PCI_ACPI $CONFIG_ACPI $CONFIG_HOTPLUG_PCI
 
 endmenu

[PATCH 2 of 2] IBM PCI Hotplug fix

[Greg KH]

Hi,

Here's a patch against 2.4.19-pre7 that allows the IBM PCI Hotplug
driver to be built into the kernel properly.

thanks,

greg k-h


diff -Nru a/drivers/hotplug/ibmphp_core.c b/drivers/hotplug/ibmphp_core.c
--- a/drivers/hotplug/ibmphp_core.c	Thu Apr 18 09:15:05 2002
+++ b/drivers/hotplug/ibmphp_core.c	Thu Apr 18 09:15:05 2002
@@ -56,7 +56,7 @@
 MODULE_DESCRIPTION (DRIVER_DESC);
 
 static int *ops[MAX_OPS + 1];
-static struct pci_ops *ibmphp_pci_root_ops;
+struct pci_ops *ibmphp_pci_root_ops;
 static int max_slots;
 
 static int irqs[16];    /* PIC mode IRQ's we're using so far (in case MPS tables don't provide default info for empty slots */