diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /arch/m68knommu/kernel/setup.c | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/m68knommu/kernel/setup.c')
| -rw-r--r-- | arch/m68knommu/kernel/setup.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/m68knommu/kernel/setup.c b/arch/m68knommu/kernel/setup.c index a220345e9746..abb80fa2b940 100644 --- a/arch/m68knommu/kernel/setup.c +++ b/arch/m68knommu/kernel/setup.c | |||
| @@ -107,6 +107,9 @@ void (*mach_power_off)( void ) = NULL; | |||
| 107 | #if defined(CONFIG_M5206e) | 107 | #if defined(CONFIG_M5206e) |
| 108 | #define CPU "COLDFIRE(m5206e)" | 108 | #define CPU "COLDFIRE(m5206e)" |
| 109 | #endif | 109 | #endif |
| 110 | #if defined(CONFIG_M520x) | ||
| 111 | #define CPU "COLDFIRE(m520x)" | ||
| 112 | #endif | ||
| 110 | #if defined(CONFIG_M523x) | 113 | #if defined(CONFIG_M523x) |
| 111 | #define CPU "COLDFIRE(m523x)" | 114 | #define CPU "COLDFIRE(m523x)" |
| 112 | #endif | 115 | #endif |
| @@ -132,7 +135,7 @@ void (*mach_power_off)( void ) = NULL; | |||
| 132 | #define CPU "COLDFIRE(m5407)" | 135 | #define CPU "COLDFIRE(m5407)" |
| 133 | #endif | 136 | #endif |
| 134 | #ifndef CPU | 137 | #ifndef CPU |
| 135 | #define CPU "UNKOWN" | 138 | #define CPU "UNKNOWN" |
| 136 | #endif | 139 | #endif |
| 137 | 140 | ||
| 138 | /* (es) */ | 141 | /* (es) */ |