diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-08 11:05:59 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-08 11:05:59 -0800 |
| commit | 7f46b1343f723f98634a5dcee47856b2000079ed (patch) | |
| tree | ed22b6298c8dd2f687890a0d79abcd1d273b5f81 /arch/blackfin/mach-bf527/include/mach/bf527.h | |
| parent | b8c31da64165b8566fc6e1c9c826f76e7b98ff02 (diff) | |
| parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 @@ #ifdef CONFIG_BF527 #define CPU "BF527" -#define CPUID 0x27e4 +#define CPUID 0x27e0 #endif #ifdef CONFIG_BF526 #define CPU "BF526" @@ -118,7 +118,7 @@ #endif #ifdef CONFIG_BF525 #define CPU "BF525" -#define CPUID 0x27e4 +#define CPUID 0x27e0 #endif #ifdef CONFIG_BF524 #define CPU "BF524" @@ -126,7 +126,7 @@ #endif #ifdef CONFIG_BF523 #define CPU "BF523" -#define CPUID 0x27e4 +#define CPUID 0x27e0 #endif #ifdef CONFIG_BF522 #define CPU "BF522" @@ -134,7 +134,7 @@ #endif #ifndef CPU -#error Unknown CPU type - This kernel doesn't seem to be configured properly +#error "Unknown CPU type - This kernel doesn't seem to be configured properly" #endif #endif /* __MACH_BF527_H__ */ |