powerpc: Get 64-bit configs to compile with ARCH=powerpc

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

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index bc063edd6de0b5cc6c267e037680e44a63218545..47a8eb6e7e3982d2a5f7bbe31f1a08b26cc72857 100644 (file)
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -10,6 +10,12 @@ CFLAGS_prom_init.o      += -fPIC
 CFLAGS_btext.o         += -fPIC
 endif
 
+obj-y                          := semaphore.o traps.o
+obj-$(CONFIG_ALTIVEC)          += vecemu.o vector.o
+obj-$(CONFIG_POWER4)           += idle_power4.o
+
+ifeq ($(CONFIG_PPC_MERGE),y)
+
 extra-$(CONFIG_PPC_STD_MMU)    := head_32.o
 extra-$(CONFIG_PPC64)          := head_64.o
 extra-$(CONFIG_40x)            := head_4xx.o
@@ -21,15 +27,12 @@ extra-$(CONFIG_PPC64)               += entry_64.o
 extra-$(CONFIG_PPC_FPU)                += fpu.o
 extra-y                                += vmlinux.lds
 
-obj-y                          += traps.o prom.o semaphore.o
+obj-y                          += process.o init_task.o \
+                                  prom.o systbl.o
 obj-$(CONFIG_PPC32)            += entry_32.o setup_32.o misc_32.o
-obj-$(CONFIG_PPC64)            += idle_power4.o
-obj-$(CONFIG_PPC64)            += misc_64.o
-ifeq ($(CONFIG_PPC32),y)
+obj-$(CONFIG_PPC64)            += setup_64.o misc_64.o
 obj-$(CONFIG_PPC_OF)           += prom_init.o of_device.o
 obj-$(CONFIG_MODULES)          += ppc_ksyms.o
-endif
-obj-$(CONFIG_ALTIVEC)          += vecemu.o vector.o
 obj-$(CONFIG_BOOTX_TEXT)       += btext.o
 
 ifeq ($(CONFIG_PPC_ISERIES),y)