[PATCH] powerpc: Merge vdso's and add vdso support to 32 bits kernel

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

diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index 58b19f1076568c85ae7cc17d903b7db4050b72a5..dac4cc20fa939af64fdec5502df18e8f68142c36 100644 (file)
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -13,10 +13,8 @@ endif
 
 obj-y               += idle.o dma.o \
                        align.o \
-                       udbg.o \
                        rtc.o \
-                       iommu.o vdso.o
-obj-y += vdso32/ vdso64/
+                       iommu.o
 
 pci-obj-$(CONFIG_PPC_MULTIPLATFORM)    += pci_dn.o pci_direct_iommu.o
 
@@ -27,8 +25,6 @@ ifneq ($(CONFIG_PPC_MERGE),y)
 obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o
 endif
 
-obj-$(CONFIG_PPC_PSERIES) += udbg_16550.o
-
 obj-$(CONFIG_KEXEC)            += machine_kexec.o
 obj-$(CONFIG_MODULES)          += module.o
 ifneq ($(CONFIG_PPC_MERGE),y)
@@ -40,10 +36,6 @@ obj-$(CONFIG_BOOTX_TEXT)     += btext.o
 endif
 obj-$(CONFIG_HVCS)             += hvcserver.o
 
-obj-$(CONFIG_PPC_PMAC)         += udbg_scc.o
-
-obj-$(CONFIG_PPC_MAPLE)                += udbg_16550.o
-
 obj-$(CONFIG_KPROBES)          += kprobes.o
 
 ifneq ($(CONFIG_PPC_MERGE),y)