diff options
| author | Daniel Palmer <danieruru@gmail.com> | 2014-04-05 10:05:45 +0200 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2014-05-26 05:28:36 +0200 |
| commit | 5198f847f7229a7f3a44d774d1e662ab6c689dc0 (patch) | |
| tree | 6c215f03ee8946132635d0aeec7134113c79d10f /arch/m68k | |
| parent | m68knommu: Fix mach_sched_init for EZ and VZ DragonBall chips (diff) | |
| download | linux-5198f847f7229a7f3a44d774d1e662ab6c689dc0.tar.xz linux-5198f847f7229a7f3a44d774d1e662ab6c689dc0.zip | |
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 <danieruru@gmail.com>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/kernel/setup_no.c | 13 |
1 files changed, 6 insertions, 7 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 -#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 |