Merge git://oak/home/sfr/kernels/iseries/work/

diff --cc arch/powerpc/kernel/Makefile
index 8421f1975dadb3d8bb1828891751dc654041c21c,0118e516b01fff0098c659954302520a0e0a1dae..572d4f5eaacb48da8209fe169306f5b967cf3bd0
--- 1/arch/powerpc/kernel/Makefile
--- 2/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@@ -31,9 -31,9 +31,8 @@@ extra-$(CONFIG_8xx)           := head_8xx.
  extra-y                               += vmlinux.lds
  
  obj-y                         += process.o init_task.o time.o \
-                                  prom.o systbl.o traps.o setup-common.o
- obj-$(CONFIG_PPC32)           += entry_32.o setup_32.o misc_32.o
+                                  prom.o traps.o setup-common.o
 -obj-$(CONFIG_PPC32)           += entry_32.o idle_6xx.o setup_32.o misc_32.o \
 -                                 systbl.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