---

yaml --- r: 261851 b: refs/heads/master c: b2cb924 h: refs/heads/master i: 261849: a126631 261847: 06b98ae v: v3
git-mirror · Jul 30, 2011 · 8759c0a · 8759c0a
1 parent c817092
commit 8759c0a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 398476195a561271654ecce0fa27330688d326df
+refs/heads/master: b2cb92417d301f46801695243df5061a9bd31dd5
diff --git a/trunk/arch/m68k/kernel/setup_mm.c b/trunk/arch/m68k/kernel/setup_mm.c
@@ -216,7 +216,9 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record)
 
 void __init setup_arch(char **cmdline_p)
 {
+#ifndef CONFIG_SUN3
 	int i;
+#endif
 
 	/* The bootinfo is located right after the kernel bss */
 	m68k_parse_bootinfo((const struct bi_record *)_end);