summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-07 18:22:54 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-07 18:22:54 -0800
commitc8053b58762745d93930826b60a4073854a15ce5 (patch)
tree1e160443e255f2b2b3e2f6a7538e508675d813fd
parent1f55c718c290616889c04946864a13ef30f64929 (diff)
downloadlinux-stable-c8053b58762745d93930826b60a4073854a15ce5.tar.gz
linux-stable-c8053b58762745d93930826b60a4073854a15ce5.tar.bz2
linux-stable-c8053b58762745d93930826b60a4073854a15ce5.zip
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>
-rw-r--r--drivers/tty/serial/8250/8250_uniphier.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/8250/8250_uniphier.c b/drivers/tty/serial/8250/8250_uniphier.c
index 1b7bd26555b7..bab6b3ae2540 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)
{