mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-25 02:48:21 +00:00
783c49fc50
shpchprm_acpi.c and pciehprm_acpi.c are nearly identical. In addition, there are functions in both these files that are also in acpiphp_glue.c. This patch will remove duplicate functions from shpchp, pciehp, and acpiphp and move this functionality to pci_hotplug, as it is not hardware specific. Get rid of shpchprm* and pciehprm* files since they are no longer needed. shpchprm_nonacpi.c and pciehprm_nonacpi.c are identical, as well as shpchprm_legacy.c and can be replaced with a macro. This patch also changes acpiphp to use the common hpp code. Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
63 lines
1.5 KiB
Makefile
63 lines
1.5 KiB
Makefile
#
|
|
# Makefile for the Linux kernel pci hotplug controller drivers.
|
|
#
|
|
|
|
obj-$(CONFIG_HOTPLUG_PCI) += pci_hotplug.o
|
|
obj-$(CONFIG_HOTPLUG_PCI_FAKE) += fakephp.o
|
|
obj-$(CONFIG_HOTPLUG_PCI_COMPAQ) += cpqphp.o
|
|
obj-$(CONFIG_HOTPLUG_PCI_IBM) += ibmphp.o
|
|
obj-$(CONFIG_HOTPLUG_PCI_ACPI) += acpiphp.o
|
|
obj-$(CONFIG_HOTPLUG_PCI_ACPI_IBM) += acpiphp_ibm.o
|
|
obj-$(CONFIG_HOTPLUG_PCI_CPCI_ZT5550) += cpcihp_zt5550.o
|
|
obj-$(CONFIG_HOTPLUG_PCI_CPCI_GENERIC) += cpcihp_generic.o
|
|
obj-$(CONFIG_HOTPLUG_PCI_PCIE) += pciehp.o
|
|
obj-$(CONFIG_HOTPLUG_PCI_SHPC) += shpchp.o
|
|
obj-$(CONFIG_HOTPLUG_PCI_RPA) += rpaphp.o
|
|
obj-$(CONFIG_HOTPLUG_PCI_RPA_DLPAR) += rpadlpar_io.o
|
|
obj-$(CONFIG_HOTPLUG_PCI_SGI) += sgi_hotplug.o
|
|
|
|
pci_hotplug-objs := pci_hotplug_core.o
|
|
|
|
ifdef CONFIG_HOTPLUG_PCI_CPCI
|
|
pci_hotplug-objs += cpci_hotplug_core.o \
|
|
cpci_hotplug_pci.o
|
|
endif
|
|
ifdef CONFIG_ACPI
|
|
pci_hotplug-objs += acpi_pcihp.o
|
|
endif
|
|
|
|
cpqphp-objs := cpqphp_core.o \
|
|
cpqphp_ctrl.o \
|
|
cpqphp_sysfs.o \
|
|
cpqphp_pci.o
|
|
cpqphp-$(CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM) += cpqphp_nvram.o
|
|
cpqphp-objs += $(cpqphp-y)
|
|
|
|
ibmphp-objs := ibmphp_core.o \
|
|
ibmphp_ebda.o \
|
|
ibmphp_pci.o \
|
|
ibmphp_res.o \
|
|
ibmphp_hpc.o
|
|
|
|
acpiphp-objs := acpiphp_core.o \
|
|
acpiphp_glue.o \
|
|
acpiphp_dock.o
|
|
|
|
rpaphp-objs := rpaphp_core.o \
|
|
rpaphp_pci.o \
|
|
rpaphp_slot.o
|
|
|
|
rpadlpar_io-objs := rpadlpar_core.o \
|
|
rpadlpar_sysfs.o
|
|
|
|
pciehp-objs := pciehp_core.o \
|
|
pciehp_ctrl.o \
|
|
pciehp_pci.o \
|
|
pciehp_hpc.o
|
|
|
|
shpchp-objs := shpchp_core.o \
|
|
shpchp_ctrl.o \
|
|
shpchp_pci.o \
|
|
shpchp_sysfs.o \
|
|
shpchp_hpc.o
|