Merge iSeries include file move

[karo-tx-linux.git] / arch / powerpc / kernel / Makefile

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 47a8eb6e7e3982d2a5f7bbe31f1a08b26cc72857..abad3059a21ad6d304f624dea0c2ae5ecaec7ee8 100644 (file)
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -10,9 +10,16 @@ CFLAGS_prom_init.o      += -fPIC
 CFLAGS_btext.o         += -fPIC
 endif
 
-obj-y                          := semaphore.o traps.o
+obj-y                          := semaphore.o cputable.o ptrace.o syscalls.o \
+                                  signal_32.o pmc.o
+obj-$(CONFIG_PPC64)            += setup_64.o binfmt_elf32.o sys_ppc32.o \
+                                  ptrace32.o systbl.o
 obj-$(CONFIG_ALTIVEC)          += vecemu.o vector.o
 obj-$(CONFIG_POWER4)           += idle_power4.o
+obj-$(CONFIG_PPC_OF)           += of_device.o
+obj-$(CONFIG_PPC_RTAS)         += rtas.o
+obj-$(CONFIG_RTAS_FW)          += rtas_fw.o
+obj-$(CONFIG_IBMVIO)           += vio.o
 
 ifeq ($(CONFIG_PPC_MERGE),y)
 
@@ -22,21 +29,29 @@ extra-$(CONFIG_40x)         := head_4xx.o
 extra-$(CONFIG_44x)            := head_44x.o
 extra-$(CONFIG_FSL_BOOKE)      := head_fsl_booke.o
 extra-$(CONFIG_8xx)            := head_8xx.o
-extra-$(CONFIG_6xx)            += idle_6xx.o
-extra-$(CONFIG_PPC64)          += entry_64.o
-extra-$(CONFIG_PPC_FPU)                += fpu.o
 extra-y                                += vmlinux.lds
 
-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)            += setup_64.o misc_64.o
-obj-$(CONFIG_PPC_OF)           += prom_init.o of_device.o
+obj-y                          += process.o init_task.o time.o \
+                                  prom.o traps.o setup-common.o
+obj-$(CONFIG_PPC32)            += entry_32.o setup_32.o misc_32.o systbl.o
+obj-$(CONFIG_PPC64)            += misc_64.o
+obj-$(CONFIG_PPC_OF)           += prom_init.o
 obj-$(CONFIG_MODULES)          += ppc_ksyms.o
 obj-$(CONFIG_BOOTX_TEXT)       += btext.o
+obj-$(CONFIG_6xx)              += idle_6xx.o
 
 ifeq ($(CONFIG_PPC_ISERIES),y)
 $(obj)/head_64.o: $(obj)/lparmap.s
 AFLAGS_head_64.o += -I$(obj)
 endif
+
+else
+# stuff used from here for ARCH=ppc or ARCH=ppc64
+obj-$(CONFIG_PPC64)            += traps.o process.o init_task.o time.o \
+                                  setup-common.o
+
+
 endif
+
+extra-$(CONFIG_PPC_FPU)                += fpu.o
+extra-$(CONFIG_PPC64)          += entry_64.o