git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[XFS] Fix merge failures
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
setup.c
diff --git
a/arch/sh/kernel/setup.c
b/arch/sh/kernel/setup.c
index
e7152cc
..
5342475
100644
(file)
--- a/
arch/sh/kernel/setup.c
+++ b/
arch/sh/kernel/setup.c
@@
-417,6
+417,7
@@
void __init setup_arch(char **cmdline_p)
}
static const char *cpu_name[] = {
+ [CPU_SH7201] = "SH7201",
[CPU_SH7203] = "SH7203", [CPU_SH7263] = "SH7263",
[CPU_SH7206] = "SH7206", [CPU_SH7619] = "SH7619",
[CPU_SH7705] = "SH7705", [CPU_SH7706] = "SH7706",