Skip to content

Commit

Permalink
m68k: Disable Amiga serial console support if modular
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
geertu authored and torvalds committed Oct 26, 2008
1 parent 9ce209d commit d1a35e4
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/char/amiserial.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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");

0 comments on commit d1a35e4

Please sign in to comment.