From af8eae2bd119b242990afbe7d970130f1b07f7d6 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 26 May 2009 17:12:20 +0900
Subject: [PATCH] --- yaml --- r: 146811 b: refs/heads/master c:
 f9e2b97dc2cf832ccceea2a2e6eccc4bc9af72cf h: refs/heads/master i:   146809:
 b8964e53d6ff8d868ccb4d9b3ea00733a62a129c   146807:
 a06abb031d79854531d4eefbd723f29e64a5d6b3 v: v3

---
 [refs]                 |  2 +-
 trunk/arch/sh/Makefile | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 0c5bbad98213..9e6b4f142419 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b25ab29bad3114f798b136b4147f255a5d5742f
+refs/heads/master: f9e2b97dc2cf832ccceea2a2e6eccc4bc9af72cf
diff --git a/trunk/arch/sh/Makefile b/trunk/arch/sh/Makefile
index a47fbd260ba4..0fe35cff90f6 100644
--- a/trunk/arch/sh/Makefile
+++ b/trunk/arch/sh/Makefile
@@ -82,7 +82,6 @@ defaultimage-$(CONFIG_SH_7206_SOLUTION_ENGINE)	:= vmlinux
 defaultimage-$(CONFIG_SH_7619_SOLUTION_ENGINE)	:= vmlinux
 
 # Set some sensible Kbuild defaults
-KBUILD_DEFCONFIG	:= shx3_defconfig
 KBUILD_IMAGE		:= $(defaultimage-y)
 
 #
@@ -90,15 +89,17 @@ KBUILD_IMAGE		:= $(defaultimage-y)
 # error messages during linking.
 #
 ifdef CONFIG_SUPERH32
-UTS_MACHINE	:= sh
-BITS		:= 32
-LDFLAGS_vmlinux	+= -e _stext
+UTS_MACHINE		:= sh
+BITS			:= 32
+LDFLAGS_vmlinux		+= -e _stext
+KBUILD_DEFCONFIG	:= shx3_defconfig
 else
-UTS_MACHINE	:= sh64
-BITS		:= 64
-LDFLAGS_vmlinux	+= --defsym phys_stext=_stext-$(CONFIG_PAGE_OFFSET) \
-		   --defsym phys_stext_shmedia=phys_stext+1 \
-		   -e phys_stext_shmedia
+UTS_MACHINE		:= sh64
+BITS			:= 64
+LDFLAGS_vmlinux		+= --defsym phys_stext=_stext-$(CONFIG_PAGE_OFFSET) \
+			   --defsym phys_stext_shmedia=phys_stext+1 \
+			   -e phys_stext_shmedia
+KBUILD_DEFCONFIG	:= cayman_defconfig
 endif
 
 ifneq ($(SUBARCH),$(ARCH))