diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:03:30 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:03:30 -0500 |
| commit | f45ac22ae2b8fc5b4c32d9b8d17ea419a8701d89 (patch) | |
| tree | 8e05bccd7b85fc3dd2fbd33ec3286de27e152819 /arch/blackfin/mach-bf527/include/mach/bf527.h | |
| parent | 79f3b3cb7a2586b319a43a7f29924c6c555e4357 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into x86/urgent
Diffstat (limited to 'arch/blackfin/mach-bf527/include/mach/bf527.h')
| -rw-r--r-- | arch/blackfin/mach-bf527/include/mach/bf527.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/blackfin/mach-bf527/include/mach/bf527.h b/arch/blackfin/mach-bf527/include/mach/bf527.h index 144f08d3f8ea..3832aab11e9a 100644 --- a/arch/blackfin/mach-bf527/include/mach/bf527.h +++ b/arch/blackfin/mach-bf527/include/mach/bf527.h | |||
| @@ -110,7 +110,7 @@ | |||
| 110 | 110 | ||
| 111 | #ifdef CONFIG_BF527 | 111 | #ifdef CONFIG_BF527 |
| 112 | #define CPU "BF527" | 112 | #define CPU "BF527" |
| 113 | #define CPUID 0x27e4 | 113 | #define CPUID 0x27e0 |
| 114 | #endif | 114 | #endif |
| 115 | #ifdef CONFIG_BF526 | 115 | #ifdef CONFIG_BF526 |
| 116 | #define CPU "BF526" | 116 | #define CPU "BF526" |
| @@ -118,7 +118,7 @@ | |||
| 118 | #endif | 118 | #endif |
| 119 | #ifdef CONFIG_BF525 | 119 | #ifdef CONFIG_BF525 |
| 120 | #define CPU "BF525" | 120 | #define CPU "BF525" |
| 121 | #define CPUID 0x27e4 | 121 | #define CPUID 0x27e0 |
| 122 | #endif | 122 | #endif |
| 123 | #ifdef CONFIG_BF524 | 123 | #ifdef CONFIG_BF524 |
| 124 | #define CPU "BF524" | 124 | #define CPU "BF524" |
| @@ -126,7 +126,7 @@ | |||
| 126 | #endif | 126 | #endif |
| 127 | #ifdef CONFIG_BF523 | 127 | #ifdef CONFIG_BF523 |
| 128 | #define CPU "BF523" | 128 | #define CPU "BF523" |
| 129 | #define CPUID 0x27e4 | 129 | #define CPUID 0x27e0 |
| 130 | #endif | 130 | #endif |
| 131 | #ifdef CONFIG_BF522 | 131 | #ifdef CONFIG_BF522 |
| 132 | #define CPU "BF522" | 132 | #define CPU "BF522" |
| @@ -134,7 +134,7 @@ | |||
| 134 | #endif | 134 | #endif |
| 135 | 135 | ||
| 136 | #ifndef CPU | 136 | #ifndef CPU |
| 137 | #error Unknown CPU type - This kernel doesn't seem to be configured properly | 137 | #error "Unknown CPU type - This kernel doesn't seem to be configured properly" |
| 138 | #endif | 138 | #endif |
| 139 | 139 | ||
| 140 | #endif /* __MACH_BF527_H__ */ | 140 | #endif /* __MACH_BF527_H__ */ |