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/include/asm/processor.h | |
| 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/include/asm/processor.h')
| -rw-r--r-- | arch/sh/include/asm/processor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/asm/processor.h b/arch/sh/include/asm/processor.h index 26b12fd8fcbd..858b716ca64d 100644 --- a/arch/sh/include/asm/processor.h +++ b/arch/sh/include/asm/processor.h | |||
| @@ -18,7 +18,7 @@ enum cpu_type { | |||
| 18 | CPU_SH7619, | 18 | CPU_SH7619, |
| 19 | 19 | ||
| 20 | /* SH-2A types */ | 20 | /* SH-2A types */ |
| 21 | CPU_SH7201, CPU_SH7203, CPU_SH7206, CPU_SH7263, CPU_MXG, | 21 | CPU_SH7201, CPU_SH7203, CPU_SH7206, CPU_SH7263, CPU_SH7264, CPU_MXG, |
| 22 | 22 | ||
| 23 | /* SH-3 types */ | 23 | /* SH-3 types */ |
| 24 | CPU_SH7705, CPU_SH7706, CPU_SH7707, | 24 | CPU_SH7705, CPU_SH7706, CPU_SH7707, |