diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-06-22 21:26:47 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-06-22 21:26:47 -0400 |
| commit | ea0daab4ae4a2f853f06c76961c0ed324fd0804c (patch) | |
| tree | f6fbe2db5772695181b7a7257b05e43343bd8d75 /arch/m32r/kernel/setup.c | |
| parent | 58aab753de605c14b9878a897e7349c3063afeff (diff) | |
| parent | 1bdf7a78c2b21fb94dfe7994dbe89310b18479d2 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
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 |