diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-29 11:46:10 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-29 11:46:10 +0200 |
| commit | e93721a70263afefbac781f575bfe851c6f95d84 (patch) | |
| tree | ab359f12a0688802aa99339bae82c51763dae9f6 /arch/microblaze/kernel/cpu/cpuinfo-static.c | |
| parent | ae1ec5e1e97f67d41e641a73380129e5905e41cc (diff) | |
| parent | c87d9732004b3f8fd82d729f12ccfb96c0df279e (diff) | |
Merge branch 'fix/pcm-jiffies-check' into topic/pcm-jiffies-check
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 cfe44effdb7..450ca6bb828 100644 --- a/arch/microblaze/kernel/cpu/cpuinfo-static.c +++ b/arch/microblaze/kernel/cpu/cpuinfo-static.c @@ -14,8 +14,8 @@ #include <asm/cpuinfo.h> #include <asm/pvr.h> -const static char family_string[] = CONFIG_XILINX_MICROBLAZE0_FAMILY; -const static char cpu_ver_string[] = CONFIG_XILINX_MICROBLAZE0_HW_VER; +static const char family_string[] = CONFIG_XILINX_MICROBLAZE0_FAMILY; +static const char cpu_ver_string[] = CONFIG_XILINX_MICROBLAZE0_HW_VER; #define err_printk(x) \ early_printk("ERROR: Microblaze " x "- different for kernel and DTS\n"); |