---

yaml --- r: 166059 b: refs/heads/master c: 337c1db h: refs/heads/master i: 166057: 9845f4d 166055: 5c2175c v: v3
git-mirror · Sep 10, 2009 · 7cd535f · 7cd535f
1 parent a53874b
commit 7cd535f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9db95cb6c430b3d9b8abbd5870e0d1e69b884ba0
+refs/heads/master: 337c1db645bce3f5a832129c4a803dc157ac7e9a
diff --git a/trunk/arch/arm/include/asm/cputype.h b/trunk/arch/arm/include/asm/cputype.h
@@ -73,7 +73,10 @@ static inline unsigned int __attribute_const__ read_cpuid_cachetype(void)
 #else
 static inline int cpu_is_xsc3(void)
 {
-	if ((read_cpuid_id() & 0xffffe000) == 0x69056000)
+	unsigned int id;
+	id = read_cpuid_id() & 0xffffe000;
+	/* It covers both Intel ID and Marvell ID */
+	if ((id == 0x69056000) || (id == 0x56056000))
 		return 1;
 
 	return 0;