diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 13:36:30 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 13:36:30 -0500 |
| commit | 52833e897fd8c6f62b3e5e27291fa9bc803f7460 (patch) | |
| tree | cfe90047ee6c7402674a29ec7258319142b96ff1 /arch/sh/kernel/setup.c | |
| parent | 8d042218b075de3cdbe066198515b3521553746e (diff) | |
| parent | 4ee29f6a52158cea526b16a44ae38643946103ec (diff) | |
Merge branch 'linus_origin' into hotfixes
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 18a5baf2cbad..ff4f54a47c07 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c | |||
| @@ -333,7 +333,7 @@ static const char *cpu_name[] = { | |||
| 333 | [CPU_SH7343] = "SH7343", [CPU_SH7785] = "SH7785", | 333 | [CPU_SH7343] = "SH7343", [CPU_SH7785] = "SH7785", |
| 334 | [CPU_SH7722] = "SH7722", [CPU_SHX3] = "SH-X3", | 334 | [CPU_SH7722] = "SH7722", [CPU_SHX3] = "SH-X3", |
| 335 | [CPU_SH5_101] = "SH5-101", [CPU_SH5_103] = "SH5-103", | 335 | [CPU_SH5_101] = "SH5-101", [CPU_SH5_103] = "SH5-103", |
| 336 | [CPU_SH_NONE] = "Unknown" | 336 | [CPU_SH7366] = "SH7366", [CPU_SH_NONE] = "Unknown" |
| 337 | }; | 337 | }; |
| 338 | 338 | ||
| 339 | const char *get_cpu_subtype(struct sh_cpuinfo *c) | 339 | const char *get_cpu_subtype(struct sh_cpuinfo *c) |