commit 772320e84588dcbe1600ffb83e5f328f2209ac2a
author Michal Marek <mmarek@suse.cz> Wed Aug 04 13:59:13 2010 +0200
committer Michal Marek <mmarek@suse.cz> Wed Aug 04 13:59:13 2010 +0200
tree a7de21b79340aeaa17c58126f6b801b82c77b53a
parent 1ce53adf13a54375d2a5c7cdbe341b2558389615
parent 9fe6206f400646a2322096b56c59891d530e8d51

Merge commit 'v2.6.35' into kbuild/kbuild

Conflicts:
	arch/powerpc/Makefile

arch/powerpc/Makefile

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index b68a838..5d42f5e 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -92,10 +92,10 @@
 else
 	KBUILD_CFLAGS += $(call cc-option,-mtune=power4)
 endif
-else
-KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
 endif
 
+KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
+
 ifeq ($(CONFIG_TUNE_CELL),y)
 	KBUILD_CFLAGS += $(call cc-option,-mtune=cell)
 endif