---

yaml --- r: 117832 b: refs/heads/master c: d1a35e4 h: refs/heads/master v: v3
git-mirror · Oct 26, 2008 · 5d888f2 · 5d888f2
1 parent ff3eb15
commit 5d888f2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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");