Revert "8250: uniphier: allow modular build with 8250 console"

gregkh · gregkh · commit c8053b587627 · 2016-02-07T18:22:54.000-08:00
This reverts commit d56edd7, it shouldn't have been applied, it was fixed properly with commit 71f50c6 ("of: drop symbols declared by _OF_DECLARE() from modules") Reported-by: Masahiro Yamada <yamada.masahiro@socionext.com> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/tty/serial/8250/8250_uniphier.c b/drivers/tty/serial/8250/8250_uniphier.c
@@ -35,7 +35,7 @@ struct uniphier8250_priv {
 	spinlock_t atomic_write_lock;
 };
 
-#if defined(CONFIG_SERIAL_8250_CONSOLE) && !defined(MODULE)
+#ifdef CONFIG_SERIAL_8250_CONSOLE
 static int __init uniphier_early_console_setup(struct earlycon_device *device,
 					       const char *options)
 {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ struct uniphier8250_priv {`
`35`	`35`	`spinlock_t atomic_write_lock;`
`36`	`36`	`};`
`37`	`37`
`38`		`-#if defined(CONFIG_SERIAL_8250_CONSOLE) && !defined(MODULE)`
	`38`	`+#ifdef CONFIG_SERIAL_8250_CONSOLE`
`39`	`39`	`static int __init uniphier_early_console_setup(struct earlycon_device *device,`
`40`	`40`	`const char *options)`
`41`	`41`	`{`