From: Paul Mackerras <paulus@samba.org>
Date: Fri, 28 Oct 2005 03:50:39 +0000 (+1000)
Subject: Merge git://oak/home/sfr/kernels/iseries/work/
X-Git-Tag: v2.6.15-rc1~59^2~62
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22b280324acbfd1a1f2374055d9bb39e7069e2bf;p=linux-2.6

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

22b280324acbfd1a1f2374055d9bb39e7069e2bf
diff --cc arch/powerpc/kernel/Makefile
index 8421f1975d,0118e516b0..572d4f5eaa
--- a/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