diff --git a/[refs] b/[refs]
index 733c83aa42c4..a802f4a2a7a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3eeffb32049d4b43b01211a79496cfdaac0c33ad
+refs/heads/master: 7cfee5ac3edd3b4226018da6aad87334793cb1c5
diff --git a/trunk/arch/sh/kernel/cpu/sh5/Makefile b/trunk/arch/sh/kernel/cpu/sh5/Makefile
index 9778f9bdff3a..7ea10732b5cc 100644
--- a/trunk/arch/sh/kernel/cpu/sh5/Makefile
+++ b/trunk/arch/sh/kernel/cpu/sh5/Makefile
@@ -1 +1,3 @@
-obj-y := entry.o
+obj-y := entry.o switchto.o
+
+obj-$(CONFIG_KALLSYMS)		+= unwind.o
diff --git a/trunk/arch/sh64/kernel/switchto.S b/trunk/arch/sh/kernel/cpu/sh5/switchto.S
similarity index 100%
rename from trunk/arch/sh64/kernel/switchto.S
rename to trunk/arch/sh/kernel/cpu/sh5/switchto.S
diff --git a/trunk/arch/sh64/kernel/unwind.c b/trunk/arch/sh/kernel/cpu/sh5/unwind.c
similarity index 100%
rename from trunk/arch/sh64/kernel/unwind.c
rename to trunk/arch/sh/kernel/cpu/sh5/unwind.c