diff --git a/[refs] b/[refs]
index c6fdbe0553a1..f0ed196dad32 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84fd089a425f055ecf4a6a72f2509ccb98314b8f
+refs/heads/master: a95970f323a273230b36d23da1426f8acc5e25c0
diff --git a/trunk/arch/mips/mm/c-r4k.c b/trunk/arch/mips/mm/c-r4k.c
index 726e899486a3..aa830c3cdebb 100644
--- a/trunk/arch/mips/mm/c-r4k.c
+++ b/trunk/arch/mips/mm/c-r4k.c
@@ -1012,8 +1012,10 @@ static void __init probe_pcache(void)
 	 * with that for us so we don't need to take care ourselves.
 	 */
 	switch (c->cputype) {
+	case CPU_20KC:
 	case CPU_R10000:
 	case CPU_R12000:
+	case CPU_SB1:
 		break;
 	case CPU_24K:
 		if (!(read_c0_config7() & (1 << 16)))