m68k: fix a compiler warning when building for DragonBall
authorDaniel Palmer <danieruru@gmail.com>
Sat, 5 Apr 2014 08:05:45 +0000 (17:05 +0900)
committerGreg Ungerer <gerg@uclinux.org>
Mon, 26 May 2014 03:28:36 +0000 (13:28 +1000)
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>
arch/m68k/kernel/setup_no.c

Simple merge