diff --git a/[refs] b/[refs]
index b1377608d353..b503e50ed679 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4eaa1cc7ce8203ac9af9184c49c635ce79592b1
+refs/heads/master: 29e0d209b38479e6817318a971082421a7d630b7
diff --git a/trunk/include/asm-sh/bugs.h b/trunk/include/asm-sh/bugs.h
index b66139ff73fc..e2d79567e2a9 100644
--- a/trunk/include/asm-sh/bugs.h
+++ b/trunk/include/asm-sh/bugs.h
@@ -48,9 +48,16 @@ static void __init check_bugs(void)
 		*p++ = 's';
 		*p++ = 'p';
 		break;
-	default:
-		*p++ = '?';
-		*p++ = '!';
+	case CPU_SH5_101 ... CPU_SH5_103:
+		*p++ = '6';
+		*p++ = '4';
+		break;
+	case CPU_SH_NONE:
+		/*
+		 * Specifically use CPU_SH_NONE rather than default:,
+		 * so we're able to have the compiler whine about
+		 * unhandled enumerations.
+		 */
 		break;
 	}