Merge with Paulus

1 files changed, 3 insertions, 2 deletions

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index abad3059a21a..7a3e1155ac9a 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -13,12 +13,13 @@ endif
 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
+                                   signal_64.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_RTAS_FLASH)        += rtas_flash.o
+obj-$(CONFIG_RTAS_PROC)         += rtas-proc.o
 obj-$(CONFIG_IBMVIO)            += vio.o
 
 ifeq ($(CONFIG_PPC_MERGE),y)