diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-22 21:50:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-22 21:50:57 -0400 |
| commit | a5324343955997d1439f26518ddac567cd5d134b (patch) | |
| tree | f43558389c41e3a0f076c4ee55d77c4aa1561779 /arch/m32r/kernel/setup.c | |
| parent | 8199d3a79c224bbe5943fa08684e1f93a17881b0 (diff) | |
| parent | a4936044001694f033fe4ea94d6034d51a6b465c (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/m32r/kernel/setup.c')
| -rw-r--r-- | arch/m32r/kernel/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m32r/kernel/setup.c b/arch/m32r/kernel/setup.c index 4826cd6e40e8..ec5674727e7f 100644 --- a/arch/m32r/kernel/setup.c +++ b/arch/m32r/kernel/setup.c | |||
| @@ -330,6 +330,8 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
| 330 | seq_printf(m, "Machine\t\t: Mappi Evaluation board\n"); | 330 | seq_printf(m, "Machine\t\t: Mappi Evaluation board\n"); |
| 331 | #elif CONFIG_PLAT_MAPPI2 | 331 | #elif CONFIG_PLAT_MAPPI2 |
| 332 | seq_printf(m, "Machine\t\t: Mappi-II Evaluation board\n"); | 332 | seq_printf(m, "Machine\t\t: Mappi-II Evaluation board\n"); |
| 333 | #elif CONFIG_PLAT_MAPPI3 | ||
| 334 | seq_printf(m, "Machine\t\t: Mappi-III Evaluation board\n"); | ||
| 333 | #elif CONFIG_PLAT_M32700UT | 335 | #elif CONFIG_PLAT_M32700UT |
| 334 | seq_printf(m, "Machine\t\t: M32700UT Evaluation board\n"); | 336 | seq_printf(m, "Machine\t\t: M32700UT Evaluation board\n"); |
| 335 | #elif CONFIG_PLAT_OPSPUT | 337 | #elif CONFIG_PLAT_OPSPUT |