patch-2.4.20 linux-2.4.20/drivers/hotplug/Makefile
Next file: linux-2.4.20/drivers/hotplug/acpiphp.h
Previous file: linux-2.4.20/drivers/hil/hp_sdc_rtc.c
Back to the patch index
Back to the overall index
- Lines: 38
- Date:
Thu Nov 28 15:53:12 2002
- Orig file:
linux-2.4.19/drivers/hotplug/Makefile
- Orig date:
Fri Aug 2 17:39:43 2002
diff -urN linux-2.4.19/drivers/hotplug/Makefile linux-2.4.20/drivers/hotplug/Makefile
@@ -4,14 +4,14 @@
O_TARGET := vmlinux-obj.o
-list-multi := cpqphp.o pci_hotplug.o ibmphp.o pcihpacpi.o
+list-multi := cpqphp.o pci_hotplug.o ibmphp.o acpiphp.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
+obj-$(CONFIG_HOTPLUG_PCI_ACPI) += acpiphp.o
pci_hotplug-objs := pci_hotplug_core.o \
pci_hotplug_util.o
@@ -34,8 +34,10 @@
endif
endif
-pcihp_acpi_objs := pcihp_acpi.o \
- pcihp_acpi_glue.o
+acpiphp_objs := acpiphp_core.o \
+ acpiphp_glue.o \
+ acpiphp_pci.o \
+ acpiphp_res.o
ifeq ($(CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM),y)
cpqphp-objs += cpqphp_nvram.o
@@ -53,5 +55,5 @@
ibmphp.o: $(ibmphp-objs)
$(LD) -r -o $@ $(ibmphp-objs)
-pcihpacpi.o: $(pcihp_acpi_objs)
- $(LD) -r -o $@ $(pcihp_acpi_objs)
+acpiphp.o: $(acpiphp_objs)
+ $(LD) -r -o $@ $(acpiphp_objs)
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)