Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / pci / hotplug / Makefile

diff --git a/drivers/pci/hotplug/Makefile b/drivers/pci/hotplug/Makefile
index 93c120d..421cfff 100644 (file)
--- a/drivers/pci/hotplug/Makefile
+++ b/drivers/pci/hotplug/Makefile
@@ -14,6 +14,7 @@ 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
 
@@ -21,6 +22,9 @@ 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   \
@@ -36,14 +40,12 @@ ibmphp-objs         :=      ibmphp_core.o   \
                                ibmphp_hpc.o
 
 acpiphp-objs           :=      acpiphp_core.o  \
-                               acpiphp_glue.o  \
-                               acpiphp_pci.o   \
-                               acpiphp_res.o
+                               acpiphp_glue.o  \
+                               acpiphp_dock.o
 
 rpaphp-objs            :=      rpaphp_core.o   \
                                rpaphp_pci.o    \
-                               rpaphp_slot.o   \
-                               rpaphp_vio.o
+                               rpaphp_slot.o
 
 rpadlpar_io-objs       :=      rpadlpar_core.o \
                                rpadlpar_sysfs.o
@@ -52,23 +54,9 @@ pciehp-objs          :=      pciehp_core.o   \
                                pciehp_ctrl.o   \
                                pciehp_pci.o    \
                                pciehp_hpc.o
-ifdef CONFIG_ACPI_BUS
-       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
-ifdef CONFIG_ACPI_BUS
-       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