diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 23:32:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 23:32:00 +0200 |
| commit | 9e3ee1c39c0cc71222f9980ccbf87fe072897eef (patch) | |
| tree | 99462000e6f0d4f907cb2fc690f19d4d441ba0f3 /arch/sh/tools | |
| parent | e56b3bc7942982ac2589c942fb345e38bc7a341a (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/stop_machine.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sh/tools')
| -rw-r--r-- | arch/sh/tools/mach-types | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sh/tools/mach-types b/arch/sh/tools/mach-types index 1bba7d36be9..0a11cc08f0a 100644 --- a/arch/sh/tools/mach-types +++ b/arch/sh/tools/mach-types @@ -46,3 +46,7 @@ R2D_1 RTS7751R2D_1 CAYMAN SH_CAYMAN SDK7780 SH_SDK7780 MIGOR SH_MIGOR +RSK7203 SH_RSK7203 +AP325RXA SH_AP325RXA +SH7763RDP SH_SH7763RDP +SH7785LCR SH_SH7785LCR |