Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

m68k: Disable Amiga serial console support if modular

Browse source 
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

because console_initcall() is not defined (nor really sensible) in the
modular case.

So disable serial console support if the driver is modular.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Geert Uytterhoeven 2008-10-26 19:51:14 +01:00 committed by Linus Torvalds
parent 9ce209d64d
commit d1a35e4d74
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/char/amiserial.c
View file

@ -2071,12 +2071,13 @@ module_init(rs_init)
module_exit(rs_exit) module_exit(rs_exit)
#if defined(CONFIG_SERIAL_CONSOLE) && !defined(MODULE)
/* /*
* ------------------------------------------------------------ * ------------------------------------------------------------
* Serial console driver * Serial console driver
* ------------------------------------------------------------ * ------------------------------------------------------------
*/ */
#ifdef CONFIG_SERIAL_CONSOLE
static void amiga_serial_putc(char c) static void amiga_serial_putc(char c)
{ {
@ -2130,6 +2131,7 @@ static int __init amiserial_console_init(void)
return 0; return 0;
} }
console_initcall(amiserial_console_init); console_initcall(amiserial_console_init);
#endif
#endif /* CONFIG_SERIAL_CONSOLE && !MODULE */
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");