2.4.19

 drivers

 hotplug

diff -urN linux-2.4.18/drivers/hotplug/Makefile linux-2.4.19/drivers/hotplug/Makefile
--- linux-2.4.18/drivers/hotplug/Makefile   Fri Nov  9 14:01:21 2001
+++ linux-2.4.19/drivers/hotplug/Makefile   Fri Aug  2 17:39:43 2002
@@ -4,12 +4,14 @@
 
 O_TARGET   := vmlinux-obj.o
 
-list-multi   := cpqphp.o pci_hotplug.o
+list-multi   := cpqphp.o pci_hotplug.o ibmphp.o pcihpacpi.o 
 
 export-objs   := pci_hotplug_core.o pci_hotplug_util.o
 
 obj-$(CONFIG_HOTPLUG_PCI)      += pci_hotplug.o
 obj-$(CONFIG_HOTPLUG_PCI_COMPAQ)   += cpqphp.o
+obj-$(CONFIG_HOTPLUG_PCI_IBM)      += ibmphp.o
+obj-$(CONFIG_HOTPLUG_PCI_ACPI)      += pcihpacpi.o
 
 pci_hotplug-objs   :=   pci_hotplug_core.o   \
             pci_hotplug_util.o
@@ -19,6 +21,22 @@
             cpqphp_proc.o   \
             cpqphp_pci.o
 
+ibmphp-objs      :=   ibmphp_core.o   \
+            ibmphp_ebda.o   \
+            ibmphp_pci.o   \
+            ibmphp_res.o   \
+            ibmphp_hpc.o
+
+ifdef CONFIG_HOTPLUG_PCI_ACPI
+  EXTRA_CFLAGS   += -D_LINUX -I$(CURDIR)/../acpi
+  ifdef CONFIG_ACPI_DEBUG
+    EXTRA_CFLAGS += -DACPI_DEBUG -Wno-unused
+  endif
+endif
+
+pcihp_acpi_objs      :=   pcihp_acpi.o   \
+            pcihp_acpi_glue.o
+
 ifeq ($(CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM),y)
    cpqphp-objs += cpqphp_nvram.o
 endif
@@ -32,3 +50,8 @@
 cpqphp.o: $(cpqphp-objs)
    $(LD) -r -o $@ $(cpqphp-objs)
 
+ibmphp.o: $(ibmphp-objs)
+   $(LD) -r -o $@ $(ibmphp-objs)
+
+pcihpacpi.o: $(pcihp_acpi_objs)
+   $(LD) -r -o $@ $(pcihp_acpi_objs)