---

yaml --- r: 273485 b: refs/heads/master c: a1431b6 h: refs/heads/master i: 273483: 64c8b0c v: v3
git-mirror · Oct 24, 2011 · 5a48ba3 · 5a48ba3
1 parent dc55522
commit 5a48ba3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 074ef0d2752a54a73f0e368fad458e4b5a57c5f8
+refs/heads/master: a1431b61a874cc1e11a3a8d59a08144eb34ae9eb
diff --git a/trunk/arch/mips/kernel/cpu-probe.c b/trunk/arch/mips/kernel/cpu-probe.c
@@ -978,7 +978,10 @@ static inline void cpu_probe_cavium(struct cpuinfo_mips *c, unsigned int cpu)
 platform:
 		set_elf_platform(cpu, "octeon");
 		break;
+	case PRID_IMP_CAVIUM_CN61XX:
 	case PRID_IMP_CAVIUM_CN63XX:
+	case PRID_IMP_CAVIUM_CN66XX:
+	case PRID_IMP_CAVIUM_CN68XX:
 		c->cputype = CPU_CAVIUM_OCTEON2;
 		__cpu_name[cpu] = "Cavium Octeon II";
 		set_elf_platform(cpu, "octeon2");