git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus
[pandora-kernel.git]
/
arch
/
m68knommu
/
kernel
/
setup.c
diff --git
a/arch/m68knommu/kernel/setup.c
b/arch/m68knommu/kernel/setup.c
index
ba92b90
..
c684adf
100644
(file)
--- a/
arch/m68knommu/kernel/setup.c
+++ b/
arch/m68knommu/kernel/setup.c
@@
-54,9
+54,6
@@
void (*mach_reset)(void);
void (*mach_halt)(void);
void (*mach_power_off)(void);
-#ifdef CONFIG_M68000
- #define CPU "MC68000"
-#endif
#ifdef CONFIG_M68328
#define CPU "MC68328"
#endif