From 8d819cab4d59ec06f1597a444fc2ca9fe3d42a18 Mon Sep 17 00:00:00 2001
From: Jayachandran C <jayachandranc@netlogicmicro.com>
Date: Tue, 23 Aug 2011 13:35:30 +0530
Subject: [PATCH] --- yaml --- r: 284779 b: refs/heads/master c:
 11d48aace2e47617eeb1fe8a4a073e40e6d480aa h: refs/heads/master i:   284777:
 71d38a5ab6dd11b256397279c598cf4a834abc9d   284775:
 b141944081678be810fee00ba02de0a1c345d0ab v: v3

---
 [refs]                             | 2 +-
 trunk/arch/mips/kernel/cpu-probe.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8eb65d8eeb95..d67e3fc2ed82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6be33cf6bd534a78dd623a3d2d7dbba4d0e832a
+refs/heads/master: 11d48aace2e47617eeb1fe8a4a073e40e6d480aa
diff --git a/trunk/arch/mips/kernel/cpu-probe.c b/trunk/arch/mips/kernel/cpu-probe.c
index c7d3cf1ce46e..aa20382b9305 100644
--- a/trunk/arch/mips/kernel/cpu-probe.c
+++ b/trunk/arch/mips/kernel/cpu-probe.c
@@ -191,6 +191,7 @@ void __init check_wait(void)
 	case CPU_CAVIUM_OCTEON_PLUS:
 	case CPU_CAVIUM_OCTEON2:
 	case CPU_JZRISC:
+	case CPU_XLR:
 		cpu_wait = r4k_wait;
 		break;