aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-06-06 05:41:02 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-06-25 17:31:04 -0400
commitae73975f193547cf50e61480b92781b199574b83 (patch)
tree391e1c01782f76476ea69658146e6fb4e1c94051
parent68b780598d75fb2be80d70034ec7b46e4fe712da (diff)
serial: 8250_mtk: drop !defined(MODULE) conditional
The !defined(MODULE) conditional has been added to the OF_EARLYCON_DECLARE() define. This commit partially reverts commit 3f5921a60f74 ("serial: 8250/mediatek: fix building with SERIAL_8250=m"). Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Matthias Brugger <matthias.bgg@gmail.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/8250/8250_mtk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c
index 3489fbcb7313..3611ec9bb4fa 100644
--- a/drivers/tty/serial/8250/8250_mtk.c
+++ b/drivers/tty/serial/8250/8250_mtk.c
@@ -301,7 +301,7 @@ static struct platform_driver mtk8250_platform_driver = {
301}; 301};
302module_platform_driver(mtk8250_platform_driver); 302module_platform_driver(mtk8250_platform_driver);
303 303
304#if defined(CONFIG_SERIAL_8250_CONSOLE) && !defined(MODULE) 304#ifdef CONFIG_SERIAL_8250_CONSOLE
305static int __init early_mtk8250_setup(struct earlycon_device *device, 305static int __init early_mtk8250_setup(struct earlycon_device *device,
306 const char *options) 306 const char *options)
307{ 307{