---

yaml --- r: 318413 b: refs/heads/master c: cec49df h: refs/heads/master i: 318411: d2e081f v: v3
git-mirror · Jul 21, 2012 · 07a6cd8 · 07a6cd8
1 parent aefe646
commit 07a6cd8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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