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;