diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-05-09 22:51:07 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-05-09 22:51:07 -0400 |
| commit | 15f99cbd071aa402e113d342448603344a337046 (patch) | |
| tree | 56f98892d1bd38029988eb8931e2321ef7e79aa0 /arch/sh/kernel/cpu/proc.c | |
| parent | b2212ea41dacda8cce0e7681a3a6ccc76c63802e (diff) | |
| parent | 41797f75486d8ca3b98d7658c2a506ac7879a8e5 (diff) | |
Merge branch 'sh/rsk-updates' into sh-latest
Conflicts:
arch/sh/Kconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/proc.c')
| -rw-r--r-- | arch/sh/kernel/cpu/proc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/kernel/cpu/proc.c b/arch/sh/kernel/cpu/proc.c index e3a16d104528..27dd6f915eae 100644 --- a/arch/sh/kernel/cpu/proc.c +++ b/arch/sh/kernel/cpu/proc.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | static const char *cpu_name[] = { | 7 | static const char *cpu_name[] = { |
| 8 | [CPU_SH7201] = "SH7201", | 8 | [CPU_SH7201] = "SH7201", |
| 9 | [CPU_SH7203] = "SH7203", [CPU_SH7263] = "SH7263", | 9 | [CPU_SH7203] = "SH7203", [CPU_SH7263] = "SH7263", |
| 10 | [CPU_SH7264] = "SH7264", | ||
| 10 | [CPU_SH7206] = "SH7206", [CPU_SH7619] = "SH7619", | 11 | [CPU_SH7206] = "SH7206", [CPU_SH7619] = "SH7619", |
| 11 | [CPU_SH7705] = "SH7705", [CPU_SH7706] = "SH7706", | 12 | [CPU_SH7705] = "SH7705", [CPU_SH7706] = "SH7706", |
| 12 | [CPU_SH7707] = "SH7707", [CPU_SH7708] = "SH7708", | 13 | [CPU_SH7707] = "SH7707", [CPU_SH7708] = "SH7708", |