From 5198f847f7229a7f3a44d774d1e662ab6c689dc0 Mon Sep 17 00:00:00 2001 From: Daniel Palmer Date: Sat, 5 Apr 2014 17:05:45 +0900 Subject: [PATCH] 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: Daniel Palmer Signed-off-by: Greg Ungerer --- arch/m68k/kernel/setup_no.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c index 5b16f5d61b44..88c27d94a721 100644 --- a/arch/m68k/kernel/setup_no.c +++ b/arch/m68k/kernel/setup_no.c @@ -58,17 +58,16 @@ void (*mach_halt)(void); void (*mach_power_off)(void); #ifdef CONFIG_M68000 +#if defined(CONFIG_M68328) +#define CPU_NAME "MC68328" +#elif defined(CONFIG_M68EZ328) +#define CPU_NAME "MC68EZ328" +#elif defined(CONFIG_M68VZ328) +#define CPU_NAME "MC68VZ328" +#else #define CPU_NAME "MC68000" #endif -#ifdef CONFIG_M68328 -#define CPU_NAME "MC68328" -#endif -#ifdef CONFIG_M68EZ328 -#define CPU_NAME "MC68EZ328" -#endif -#ifdef CONFIG_M68VZ328 -#define CPU_NAME "MC68VZ328" -#endif +#endif /* CONFIG_M68000 */ #ifdef CONFIG_M68360 #define CPU_NAME "MC68360" #endif