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 a972757..3c71e30 100644 (file)
--- a/drivers/pci/hotplug/Makefile
+++ b/drivers/pci/hotplug/Makefile
@@ -7,12 +7,14 @@ 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
 
@@ -35,14 +37,11 @@ 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
 
 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
@@ -50,9 +49,8 @@ rpadlpar_io-objs      :=      rpadlpar_core.o \
 pciehp-objs            :=      pciehp_core.o   \
                                pciehp_ctrl.o   \
                                pciehp_pci.o    \
-                               pciehp_sysfs.o  \
                                pciehp_hpc.o
-ifdef CONFIG_ACPI_BUS
+ifdef CONFIG_ACPI
        pciehp-objs += pciehprm_acpi.o
 else
        pciehp-objs += pciehprm_nonacpi.o
@@ -63,7 +61,7 @@ shpchp-objs           :=      shpchp_core.o   \
                                shpchp_pci.o    \
                                shpchp_sysfs.o  \
                                shpchp_hpc.o
-ifdef CONFIG_ACPI_BUS
+ifdef CONFIG_ACPI
        shpchp-objs += shpchprm_acpi.o
 else
        ifdef CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY