git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
pci
/
hotplug
/
Makefile
diff --git
a/drivers/pci/hotplug/Makefile
b/drivers/pci/hotplug/Makefile
index
34a1891
..
3c71e30
100644
(file)
--- a/
drivers/pci/hotplug/Makefile
+++ b/
drivers/pci/hotplug/Makefile
@@
-22,9
+22,6
@@
ifdef CONFIG_HOTPLUG_PCI_CPCI
pci_hotplug-objs += cpci_hotplug_core.o \
cpci_hotplug_pci.o
endif
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-objs := cpqphp_core.o \
cpqphp_ctrl.o \
@@
-53,9
+50,23
@@
pciehp-objs := pciehp_core.o \
pciehp_ctrl.o \
pciehp_pci.o \
pciehp_hpc.o
pciehp_ctrl.o \
pciehp_pci.o \
pciehp_hpc.o
+ifdef CONFIG_ACPI
+ pciehp-objs += pciehprm_acpi.o
+else
+ pciehp-objs += pciehprm_nonacpi.o
+endif
shpchp-objs := shpchp_core.o \
shpchp_ctrl.o \
shpchp_pci.o \
shpchp_sysfs.o \
shpchp_hpc.o
shpchp-objs := shpchp_core.o \
shpchp_ctrl.o \
shpchp_pci.o \
shpchp_sysfs.o \
shpchp_hpc.o
+ifdef CONFIG_ACPI
+ shpchp-objs += shpchprm_acpi.o
+else
+ ifdef CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY
+ shpchp-objs += shpchprm_legacy.o
+ else
+ shpchp-objs += shpchprm_nonacpi.o
+ endif
+endif