m68k: Disable Amiga serial console support if modular (d1a35e4d) · Commits · e / devices / android_kernel_sony_msm8994

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>

drivers/char/amiserial.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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");