From 99efe362d236391ec502d0dbb51dc88f0fdc8c80 Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Fri, 6 Aug 2010 14:13:13 +0200
Subject: [PATCH] --- yaml --- r: 217128 b: refs/heads/master c:
 69717607f028d7d4f4b355afb86556f3dd9363fc h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/microblaze/include/asm/setup.h | 6 ++++++
 trunk/arch/microblaze/kernel/setup.c      | 6 ------
 trunk/arch/microblaze/kernel/timer.c      | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 65ff448472c8..1a0b50e49a8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d4320956f0f8aa2c36c23f209acc3e4c3ae52d6
+refs/heads/master: 69717607f028d7d4f4b355afb86556f3dd9363fc
diff --git a/trunk/arch/microblaze/include/asm/setup.h b/trunk/arch/microblaze/include/asm/setup.h
index 782b5c89248e..5f910ebe0325 100644
--- a/trunk/arch/microblaze/include/asm/setup.h
+++ b/trunk/arch/microblaze/include/asm/setup.h
@@ -25,6 +25,12 @@ void early_printk(const char *fmt, ...);
 int setup_early_printk(char *opt);
 void disable_early_printk(void);
 
+#if defined(CONFIG_EARLY_PRINTK) && defined(CONFIG_SERIAL_UARTLITE_CONSOLE)
+#define eprintk early_printk
+#else
+#define eprintk printk
+#endif
+
 void heartbeat(void);
 void setup_heartbeat(void);
 
diff --git a/trunk/arch/microblaze/kernel/setup.c b/trunk/arch/microblaze/kernel/setup.c
index f5f768842354..bb1558e4b283 100644
--- a/trunk/arch/microblaze/kernel/setup.c
+++ b/trunk/arch/microblaze/kernel/setup.c
@@ -92,12 +92,6 @@ inline unsigned get_romfs_len(unsigned *addr)
 }
 #endif	/* CONFIG_MTD_UCLINUX_EBSS */
 
-#if defined(CONFIG_EARLY_PRINTK) && defined(CONFIG_SERIAL_UARTLITE_CONSOLE)
-#define eprintk early_printk
-#else
-#define eprintk printk
-#endif
-
 void __init machine_early_init(const char *cmdline, unsigned int ram,
 		unsigned int fdt, unsigned int msr)
 {
diff --git a/trunk/arch/microblaze/kernel/timer.c b/trunk/arch/microblaze/kernel/timer.c
index b1380ae93ae1..ec7df67006ba 100644
--- a/trunk/arch/microblaze/kernel/timer.c
+++ b/trunk/arch/microblaze/kernel/timer.c
@@ -278,7 +278,7 @@ void __init time_init(void)
 	timer_num =
 		*(int *) of_get_property(timer, "xlnx,one-timer-only", NULL);
 	if (timer_num) {
-		printk(KERN_EMERG "Please enable two timers in HW\n");
+		eprintk(KERN_EMERG "Please enable two timers in HW\n");
 		BUG();
 	}