diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 18:18:40 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 18:18:40 -0400 |
| commit | fc05505b77f7900a1bb74fb3f3a4343dee4265a4 (patch) | |
| tree | 6517919cb60bd9465078512cacbefd8c77f94b76 /arch/microblaze/kernel/cpu/cpuinfo-static.c | |
| parent | a2ab67fae1ab9226679495a8d260f4e6555efc5f (diff) | |
| parent | 11c79740d3c03cb81f84e98cf2e2dbd8d9bb53cd (diff) | |
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into devel
Diffstat (limited to 'arch/microblaze/kernel/cpu/cpuinfo-static.c')
| -rw-r--r-- | arch/microblaze/kernel/cpu/cpuinfo-static.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/microblaze/kernel/cpu/cpuinfo-static.c b/arch/microblaze/kernel/cpu/cpuinfo-static.c index cfe44effdb77..450ca6bb828d 100644 --- a/arch/microblaze/kernel/cpu/cpuinfo-static.c +++ b/arch/microblaze/kernel/cpu/cpuinfo-static.c | |||
| @@ -14,8 +14,8 @@ | |||
| 14 | #include <asm/cpuinfo.h> | 14 | #include <asm/cpuinfo.h> |
| 15 | #include <asm/pvr.h> | 15 | #include <asm/pvr.h> |
| 16 | 16 | ||
| 17 | const static char family_string[] = CONFIG_XILINX_MICROBLAZE0_FAMILY; | 17 | static const char family_string[] = CONFIG_XILINX_MICROBLAZE0_FAMILY; |
| 18 | const static char cpu_ver_string[] = CONFIG_XILINX_MICROBLAZE0_HW_VER; | 18 | static const char cpu_ver_string[] = CONFIG_XILINX_MICROBLAZE0_HW_VER; |
| 19 | 19 | ||
| 20 | #define err_printk(x) \ | 20 | #define err_printk(x) \ |
| 21 | early_printk("ERROR: Microblaze " x "- different for kernel and DTS\n"); | 21 | early_printk("ERROR: Microblaze " x "- different for kernel and DTS\n"); |