diff --git a/[refs] b/[refs]
index 9474ce9094cf..04ef28f18877 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3049ea7e04408abf35dc295014cb6f1eabcf9b8c
+refs/heads/master: ca786f83a97d7897b013b1e9b290c9010b69af9b
diff --git a/trunk/arch/powerpc/Makefile b/trunk/arch/powerpc/Makefile
index dc2d18e93002..643839a3f5d8 100644
--- a/trunk/arch/powerpc/Makefile
+++ b/trunk/arch/powerpc/Makefile
@@ -35,7 +35,11 @@ endif
 
 export CROSS32CC CROSS32AS CROSS32LD CROSS32AR CROSS32OBJCOPY
 
+ifeq ($(CROSS_COMPILE),)
 KBUILD_DEFCONFIG := $(shell uname -m)_defconfig
+else
+KBUILD_DEFCONFIG := ppc64_defconfig
+endif
 
 ifeq ($(CONFIG_PPC64),y)
 OLDARCH	:= ppc64