From 07a6cd8a71d704bd0b00247eb0d1b7075943637d Mon Sep 17 00:00:00 2001
From: Joe Millenbach <jmillenbach@gmail.com>
Date: Thu, 19 Jul 2012 18:04:41 -0700
Subject: [PATCH] --- yaml --- r: 318413 b: refs/heads/master c:
 cec49df9d331feaa2fea3d24c07147c7659940d1 h: refs/heads/master i:   318411:
 d2e081f17106fa9ea32895b04da324d3c4f45918 v: v3

---
 [refs]                                                |  2 +-
 trunk/arch/x86/boot/compressed/early_serial_console.c |  4 ++++
 trunk/arch/x86/boot/compressed/misc.h                 | 10 ++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9c61dfcbbf22..62005104f1ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 641a1cebfe2f05fa1a48503d816fc70cf707d033
+refs/heads/master: cec49df9d331feaa2fea3d24c07147c7659940d1
diff --git a/trunk/arch/x86/boot/compressed/early_serial_console.c b/trunk/arch/x86/boot/compressed/early_serial_console.c
index 261e81fb9582..d3d003cb5481 100644
--- a/trunk/arch/x86/boot/compressed/early_serial_console.c
+++ b/trunk/arch/x86/boot/compressed/early_serial_console.c
@@ -1,5 +1,9 @@
 #include "misc.h"
 
+#ifdef CONFIG_EARLY_PRINTK
+
 int early_serial_base;
 
 #include "../early_serial_console.c"
+
+#endif
diff --git a/trunk/arch/x86/boot/compressed/misc.h b/trunk/arch/x86/boot/compressed/misc.h
index 618e5c830f15..3ffee6e0c54c 100644
--- a/trunk/arch/x86/boot/compressed/misc.h
+++ b/trunk/arch/x86/boot/compressed/misc.h
@@ -43,7 +43,17 @@ int cmdline_find_option(const char *option, char *buffer, int bufsize);
 int cmdline_find_option_bool(const char *option);
 
 /* early_serial_console.c */
+#ifdef CONFIG_EARLY_PRINTK
+
 extern int early_serial_base;
 void console_init(void);
 
+#else
+
+static const int early_serial_base;
+static inline void console_init(void)
+{ }
+
+#endif
+
 #endif