[PATCH] powerpc: Fix handling of fpscr on 64-bit
[pandora-kernel.git] / arch / powerpc / kernel / Makefile
index 043ddd0..94cf917 100644 (file)
@@ -10,11 +10,15 @@ CFLAGS_prom_init.o      += -fPIC
 CFLAGS_btext.o         += -fPIC
 endif
 
-obj-y                          := semaphore.o cputable.o ptrace.o signal_32.o
-obj-$(CONFIG_PPC64)            += binfmt_elf32.o sys_ppc32.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
 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_IBMVIO)           += vio.o
 
 ifeq ($(CONFIG_PPC_MERGE),y)
 
@@ -24,15 +28,13 @@ 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 traps.o syscalls.o
-obj-$(CONFIG_PPC32)            += entry_32.o setup_32.o misc_32.o
-obj-$(CONFIG_PPC64)            += setup_64.o misc_64.o
+obj-y                          += process.o init_task.o time.o \
+                                  prom.o systbl.o traps.o setup-common.o
+obj-$(CONFIG_PPC32)            += entry_32.o idle_6xx.o setup_32.o misc_32.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
@@ -44,9 +46,9 @@ endif
 
 else
 # stuff used from here for ARCH=ppc or ARCH=ppc64
-obj-$(CONFIG_PPC64)            += traps.o process.o init_task.o syscalls.o
+obj-$(CONFIG_PPC64)            += traps.o process.o init_task.o time.o
 
-fpux-$(CONFIG_PPC32)           += fpu.o
-extra-$(CONFIG_PPC_FPU)                += $(fpux-y)
 
 endif
+
+extra-$(CONFIG_PPC_FPU)                += fpu.o