Merge commit 'v2.6.35' into kbuild/kbuild

Conflicts:
	arch/powerpc/Makefile

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index b68a83853e1c..5d42f5eae70f 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -92,10 +92,10 @@ endif
 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