This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / ppc64 / kernel / Makefile

diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index c5dd7e1..c36dd89 100644 (file)
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -15,11 +15,14 @@ obj-y               :=      setup.o entry.o traps.o irq.o idle.o dma.o \
 
 obj-$(CONFIG_PPC_OF) +=        of_device.o
 
-pci-obj-$(CONFIG_PPC_ISERIES)  += iSeries_pci.o iSeries_pci_reset.o \
-                                    iSeries_IoMmTable.o
-pci-obj-$(CONFIG_PPC_PSERIES)  += pci_dn.o pci_dma_direct.o
+obj-$(CONFIG_PCI)      += pci.o pci_dn.o pci_iommu.o
 
-obj-$(CONFIG_PCI)      += pci.o pci_iommu.o $(pci-obj-y)
+ifdef CONFIG_PPC_ISERIES
+obj-$(CONFIG_PCI)      += iSeries_pci.o iSeries_pci_reset.o \
+                            iSeries_IoMmTable.o 
+else
+obj-$(CONFIG_PCI)      += pci_dma_direct.o
+endif
 
 obj-$(CONFIG_PPC_ISERIES) += iSeries_irq.o \
                             iSeries_VpdInfo.o XmPciLpEvent.o \
@@ -43,7 +46,6 @@ obj-$(CONFIG_VIOPATH)         += viopath.o
 obj-$(CONFIG_LPARCFG)          += lparcfg.o
 obj-$(CONFIG_HVC_CONSOLE)      += hvconsole.o
 obj-$(CONFIG_BOOTX_TEXT)       += btext.o
-obj-$(CONFIG_HVCS)             += hvcserver.o
 
 obj-$(CONFIG_PPC_PMAC)         += pmac_setup.o pmac_feature.o pmac_pci.o \
                                   pmac_time.o pmac_nvram.o pmac_low_i2c.o \
@@ -54,6 +56,4 @@ ifdef CONFIG_SMP
 obj-$(CONFIG_PPC_PMAC)         += pmac_smp.o smp-tbsync.o
 endif
 
-obj-$(CONFIG_ALTIVEC)          += vecemu.o vector.o
-
 CFLAGS_ioctl32.o += -Ifs/