---

yaml --- r: 68281 b: refs/heads/master c: 26fad19 h: refs/heads/master i: 68279: dab6ee8 v: v3
git-mirror · Sep 27, 2007 · 06a7a19 · 06a7a19
1 parent 39bbfe6
commit 06a7a19
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f91bbb58413e0bce9726cd6d12bf4b95c343a7f
+refs/heads/master: 26fad19d8c3ca9abd7ffb85a63f8e25f1b4910dc
diff --git a/trunk/arch/sh/kernel/cpu/sh4/probe.c b/trunk/arch/sh/kernel/cpu/sh4/probe.c
@@ -3,7 +3,7 @@
  *
  * CPU Subtype Probing for SH-4.
  *
- * Copyright (C) 2001 - 2006  Paul Mundt
+ * Copyright (C) 2001 - 2007  Paul Mundt
  * Copyright (C) 2003  Richard Curnow
  *
  * This file is subject to the terms and conditions of the GNU General Public
@@ -52,12 +52,9 @@ int __init detect_cpu_and_cache_system(void)
 	current_cpu_data.dcache.linesz		= L1_CACHE_BYTES;
 
 	/*
-	 * Setup some generic flags we can probe
-	 * (L2 and DSP detection only work on SH-4A)
+	 * Setup some generic flags we can probe on SH-4A parts
 	 */
 	if (((pvr >> 16) & 0xff) == 0x10) {
-		if ((cvr & 0x02000000) == 0)
-			current_cpu_data.flags |= CPU_HAS_L2_CACHE;
 		if ((cvr & 0x10000000) == 0)
 			current_cpu_data.flags |= CPU_HAS_DSP;