vserver 1.9.3
[linux-2.6.git] / arch / ppc64 / kernel / Makefile
index c5dd7e1..020b64f 100644 (file)
@@ -3,11 +3,11 @@
 #
 
 EXTRA_CFLAGS   += -mno-minimal-toc
-extra-y                := head.o vmlinux.lds.s
+extra-y                := head.o vmlinux.lds
 
 obj-y               := setup.o entry.o traps.o irq.o idle.o dma.o \
                        time.o process.o signal.o syscalls.o misc.o ptrace.o \
-                       align.o semaphore.o bitops.o stab.o pacaData.o \
+                       align.o semaphore.o bitops.o pacaData.o \
                        udbg.o binfmt_elf32.o sys_ppc32.o ioctl32.o \
                        ptrace32.o signal32.o rtc.o init_task.o \
                        lmb.o cputable.o cpu_setup_power4.o idle_power4.o \
@@ -17,9 +17,9 @@ 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
+pci-obj-$(CONFIG_PPC_MULTIPLATFORM)    += pci_dn.o pci_dma_direct.o
 
-obj-$(CONFIG_PCI)      += pci.o pci_iommu.o $(pci-obj-y)
+obj-$(CONFIG_PCI)      += pci.o pci_iommu.o iomap.o $(pci-obj-y)
 
 obj-$(CONFIG_PPC_ISERIES) += iSeries_irq.o \
                             iSeries_VpdInfo.o XmPciLpEvent.o \
@@ -28,10 +28,11 @@ obj-$(CONFIG_PPC_ISERIES) += iSeries_irq.o \
                             mf.o HvLpEvent.o iSeries_proc.o iSeries_htab.o \
                             iSeries_iommu.o
 
+obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o open_pic.o i8259.o prom_init.o prom.o
+
 obj-$(CONFIG_PPC_PSERIES) += pSeries_pci.o pSeries_lpar.o pSeries_hvCall.o \
-                            eeh.o nvram.o pSeries_nvram.o rtasd.o ras.o \
-                            open_pic.o xics.o pSeries_htab.o rtas.o \
-                            chrp_setup.o i8259.o prom.o pSeries_iommu.o
+                            eeh.o pSeries_nvram.o rtasd.o ras.o \
+                            xics.o rtas.o pSeries_setup.o pSeries_iommu.o
 
 obj-$(CONFIG_PROC_FS)          += proc_ppc64.o
 obj-$(CONFIG_RTAS_FLASH)       += rtas_flash.o
@@ -48,7 +49,7 @@ 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 \
                                   open_pic_u3.o
-obj-$(CONFIG_PMAC_DART)                += pmac_iommu.o
+obj-$(CONFIG_U3_DART)          += u3_iommu.o
 
 ifdef CONFIG_SMP
 obj-$(CONFIG_PPC_PMAC)         += pmac_smp.o smp-tbsync.o