diff options
author | Hirokazu Takata <takata@linux-m32r.org> | 2005-10-30 18:00:04 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 20:37:15 -0500 |
commit | c978b0179b31600394d5ebdb0940b492ec05500f (patch) | |
tree | 5126e984a9eacbcb25a02a9ef711abda33ceed88 /arch/m32r/kernel | |
parent | baa0b84f104c8e78ddaa8816eb9deac0098429e6 (diff) |
[PATCH] m32r: fix #if warnings
Fix warnings for #if directives.
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m32r/kernel')
-rw-r--r-- | arch/m32r/kernel/setup.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/m32r/kernel/setup.c b/arch/m32r/kernel/setup.c index ec5674727e7f..f722ec8eb021 100644 --- a/arch/m32r/kernel/setup.c +++ b/arch/m32r/kernel/setup.c | |||
@@ -305,19 +305,19 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
305 | 305 | ||
306 | seq_printf(m, "processor\t: %ld\n", cpu); | 306 | seq_printf(m, "processor\t: %ld\n", cpu); |
307 | 307 | ||
308 | #ifdef CONFIG_CHIP_VDEC2 | 308 | #if defined(CONFIG_CHIP_VDEC2) |
309 | seq_printf(m, "cpu family\t: VDEC2\n" | 309 | seq_printf(m, "cpu family\t: VDEC2\n" |
310 | "cache size\t: Unknown\n"); | 310 | "cache size\t: Unknown\n"); |
311 | #elif CONFIG_CHIP_M32700 | 311 | #elif defined(CONFIG_CHIP_M32700) |
312 | seq_printf(m,"cpu family\t: M32700\n" | 312 | seq_printf(m,"cpu family\t: M32700\n" |
313 | "cache size\t: I-8KB/D-8KB\n"); | 313 | "cache size\t: I-8KB/D-8KB\n"); |
314 | #elif CONFIG_CHIP_M32102 | 314 | #elif defined(CONFIG_CHIP_M32102) |
315 | seq_printf(m,"cpu family\t: M32102\n" | 315 | seq_printf(m,"cpu family\t: M32102\n" |
316 | "cache size\t: I-8KB\n"); | 316 | "cache size\t: I-8KB\n"); |
317 | #elif CONFIG_CHIP_OPSP | 317 | #elif defined(CONFIG_CHIP_OPSP) |
318 | seq_printf(m,"cpu family\t: OPSP\n" | 318 | seq_printf(m,"cpu family\t: OPSP\n" |
319 | "cache size\t: I-8KB/D-8KB\n"); | 319 | "cache size\t: I-8KB/D-8KB\n"); |
320 | #elif CONFIG_CHIP_MP | 320 | #elif defined(CONFIG_CHIP_MP) |
321 | seq_printf(m, "cpu family\t: M32R-MP\n" | 321 | seq_printf(m, "cpu family\t: M32R-MP\n" |
322 | "cache size\t: I-xxKB/D-xxKB\n"); | 322 | "cache size\t: I-xxKB/D-xxKB\n"); |
323 | #else | 323 | #else |
@@ -326,19 +326,19 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
326 | seq_printf(m, "bogomips\t: %lu.%02lu\n", | 326 | seq_printf(m, "bogomips\t: %lu.%02lu\n", |
327 | c->loops_per_jiffy/(500000/HZ), | 327 | c->loops_per_jiffy/(500000/HZ), |
328 | (c->loops_per_jiffy/(5000/HZ)) % 100); | 328 | (c->loops_per_jiffy/(5000/HZ)) % 100); |
329 | #ifdef CONFIG_PLAT_MAPPI | 329 | #if defined(CONFIG_PLAT_MAPPI) |
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 defined(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 | 333 | #elif defined(CONFIG_PLAT_MAPPI3) |
334 | seq_printf(m, "Machine\t\t: Mappi-III Evaluation board\n"); | 334 | seq_printf(m, "Machine\t\t: Mappi-III Evaluation board\n"); |
335 | #elif CONFIG_PLAT_M32700UT | 335 | #elif defined(CONFIG_PLAT_M32700UT) |
336 | seq_printf(m, "Machine\t\t: M32700UT Evaluation board\n"); | 336 | seq_printf(m, "Machine\t\t: M32700UT Evaluation board\n"); |
337 | #elif CONFIG_PLAT_OPSPUT | 337 | #elif defined(CONFIG_PLAT_OPSPUT) |
338 | seq_printf(m, "Machine\t\t: OPSPUT Evaluation board\n"); | 338 | seq_printf(m, "Machine\t\t: OPSPUT Evaluation board\n"); |
339 | #elif CONFIG_PLAT_USRV | 339 | #elif defined(CONFIG_PLAT_USRV) |
340 | seq_printf(m, "Machine\t\t: uServer\n"); | 340 | seq_printf(m, "Machine\t\t: uServer\n"); |
341 | #elif CONFIG_PLAT_OAKS32R | 341 | #elif defined(CONFIG_PLAT_OAKS32R) |
342 | seq_printf(m, "Machine\t\t: OAKS32R\n"); | 342 | seq_printf(m, "Machine\t\t: OAKS32R\n"); |
343 | #else | 343 | #else |
344 | seq_printf(m, "Machine\t\t: Unknown\n"); | 344 | seq_printf(m, "Machine\t\t: Unknown\n"); |