50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
Subject: [PATCH] m68k: Disable Amiga serial console support if modular
|
|
|
|
From: Geert Uytterhoeven <geert@linux-m68k.org>
|
|
|
|
If CONFIG_AMIGA_BUILTIN_SERIAL=m, I get the following warnings:
|
|
|
|
| drivers/char/amiserial.c: At top level:
|
|
| drivers/char/amiserial.c:2138: warning: data definition has no type or storage class
|
|
| drivers/char/amiserial.c:2138: warning: type defaults to 'int' in declaration of 'console_initcall'
|
|
| drivers/char/amiserial.c:2138: warning: parameter names (without types) in function declaration
|
|
| drivers/char/amiserial.c:2134: warning: 'amiserial_console_init' defined but not used
|
|
|
|
Apparently console_initcall() is not defined in the modular case.
|
|
|
|
Disable serial console support if the driver is modular.
|
|
|
|
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
|
|
---
|
|
Any better alternative fix?
|
|
|
|
drivers/char/amiserial.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/char/amiserial.c
|
|
+++ b/drivers/char/amiserial.c
|
|
@@ -2077,12 +2077,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)
|
|
{
|
|
@@ -2136,6 +2137,7 @@ static int __init amiserial_console_init
|
|
return 0;
|
|
}
|
|
console_initcall(amiserial_console_init);
|
|
-#endif
|
|
+
|
|
+#endif /* CONFIG_SERIAL_CONSOLE && !MODULE */
|
|
|
|
MODULE_LICENSE("GPL");
|