Merge tag 'microblaze-v6.10' of git://git.monstr.eu/linux-2.6-microblaze

Pull microblaze updates from Michal Simek:

- Cleanup code around removed early_printk

* tag 'microblaze-v6.10' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Remove early printk call from cpuinfo-static.c
microblaze: Remove gcc flag for non existing early_printk.c file

+1 -2
-1
arch/microblaze/kernel/Makefile
··· 7 7 # Do not trace early boot code and low level code 8 8 CFLAGS_REMOVE_timer.o = -pg 9 9 CFLAGS_REMOVE_intc.o = -pg 10 - CFLAGS_REMOVE_early_printk.o = -pg 11 10 CFLAGS_REMOVE_ftrace.o = -pg 12 11 CFLAGS_REMOVE_process.o = -pg 13 12 endif
+1 -1
arch/microblaze/kernel/cpu/cpuinfo-static.c
··· 18 18 static const char cpu_ver_string[] = CONFIG_XILINX_MICROBLAZE0_HW_VER; 19 19 20 20 #define err_printk(x) \ 21 - early_printk("ERROR: Microblaze " x "-different for kernel and DTS\n"); 21 + pr_err("ERROR: Microblaze " x "-different for kernel and DTS\n"); 22 22 23 23 void __init set_cpuinfo_static(struct cpuinfo *ci, struct device_node *cpu) 24 24 {