From 5d888f2d3b2bcf7def383913375eedfb5a8a5f83 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sun, 26 Oct 2008 19:51:14 +0100
Subject: [PATCH] --- yaml --- r: 117832 b: refs/heads/master c:
 d1a35e4d74d070b06163e435e590ca90a2420b9e h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/char/amiserial.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4dcc68486548..5c8ffb6cb141 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ce209d64d820a6d5ed6b952e2c0f917faad6031
+refs/heads/master: d1a35e4d74d070b06163e435e590ca90a2420b9e
diff --git a/trunk/drivers/char/amiserial.c b/trunk/drivers/char/amiserial.c
index 98821f97583c..b97aebd7aeb8 100644
--- a/trunk/drivers/char/amiserial.c
+++ b/trunk/drivers/char/amiserial.c
@@ -2071,12 +2071,13 @@ module_init(rs_init)
 module_exit(rs_exit)
 
 
+#if defined(CONFIG_SERIAL_CONSOLE) && !defined(MODULE)
+
 /*
  * ------------------------------------------------------------
  * Serial console driver
  * ------------------------------------------------------------
  */
-#ifdef CONFIG_SERIAL_CONSOLE
 
 static void amiga_serial_putc(char c)
 {
@@ -2130,6 +2131,7 @@ static int __init amiserial_console_init(void)
 	return 0;
 }
 console_initcall(amiserial_console_init);
-#endif
+
+#endif /* CONFIG_SERIAL_CONSOLE && !MODULE */
 
 MODULE_LICENSE("GPL");