diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-06-20 18:29:27 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2007-06-20 18:29:27 +0900 |
| commit | 70876facfa9bb6596e4c09e9ed6b8f26d0bcba51 (patch) | |
| tree | 05ebd850c3061a5e923d1ee8ef6c72b68805983b /arch/sh/kernel/setup.c | |
| parent | b2309d684078f2be1d5db6ceabc99c51f9af3b6b (diff) | |
| parent | 2b1bd1ac5d4bffe3fd542bfe1784a583bd7df4fa (diff) | |
| download | op-kernel-dev-70876facfa9bb6596e4c09e9ed6b8f26d0bcba51.zip op-kernel-dev-70876facfa9bb6596e4c09e9ed6b8f26d0bcba51.tar.gz | |
Merge branch 'x3'
Diffstat (limited to 'arch/sh/kernel/setup.c')
| -rw-r--r-- | arch/sh/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 765f83c..de8e6e2 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -285,7 +285,7 @@ static const char *cpu_name[] = { [CPU_SH7770] = "SH7770", [CPU_SH7780] = "SH7780", [CPU_SH7781] = "SH7781", [CPU_SH7343] = "SH7343", [CPU_SH7785] = "SH7785", [CPU_SH7722] = "SH7722", - [CPU_SH_NONE] = "Unknown" + [CPU_SHX3] = "SH-X3", [CPU_SH_NONE] = "Unknown" }; const char *get_cpu_subtype(struct sh_cpuinfo *c) |
