Commit 5198f847 authored by Daniel Palmer's avatar Daniel Palmer Committed by Greg Ungerer

m68k: fix a compiler warning when building for DragonBall

In file included from arch/m68k/kernel/setup.c:4:0:
arch/m68k/kernel/setup_no.c:70:0: warning: "CPU_NAME" redefined [enabled by default]
 #define CPU_NAME "MC68VZ328"
 ^
arch/m68k/kernel/setup_no.c:61:0: note: this is the location of the previous definition
 #define CPU_NAME "MC68000"
 ^
Signed-off-by: default avatarDaniel Palmer <danieruru@gmail.com>
Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent 0b175516
......@@ -58,17 +58,16 @@ void (*mach_halt)(void);
void (*mach_power_off)(void);
#ifdef CONFIG_M68000
#define CPU_NAME "MC68000"
#endif
#ifdef CONFIG_M68328
#if defined(CONFIG_M68328)
#define CPU_NAME "MC68328"
#endif
#ifdef CONFIG_M68EZ328
#elif defined(CONFIG_M68EZ328)
#define CPU_NAME "MC68EZ328"
#endif
#ifdef CONFIG_M68VZ328
#elif defined(CONFIG_M68VZ328)
#define CPU_NAME "MC68VZ328"
#else
#define CPU_NAME "MC68000"
#endif
#endif /* CONFIG_M68000 */
#ifdef CONFIG_M68360
#define CPU_NAME "MC68360"
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment