From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 8 Feb 2016 02:22:54 +0000 (-0800)
Subject: Revert "8250: uniphier: allow modular build with 8250 console"
X-Git-Tag: v4.14-rc1~3822^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c8053b58762745d93930826b60a4073854a15ce5;p=platform%2Fkernel%2Flinux-rpi.git

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

This reverts commit d56edd7ed0ed46a8043ee3040ededbd190818ccf, it
shouldn't have been applied, it was fixed properly with commit
71f50c6d9a2276f3ec85384bffe2aee1962f4669 ("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
index 1b7bd26..bab6b3a 100644
--- 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)
 {