serial: 8250_uniphier: drop !defined(MODULE) conditional
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Mon, 6 Jun 2016 09:41:01 +0000 (18:41 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 25 Jun 2016 21:31:04 +0000 (14:31 -0700)
The !defined(MODULE) conditional has been added to the
OF_EARLYCON_DECLARE() define.

Now we can revert commit a2d3ea2f2399 ("serial: 8250/uniphier:
fix modular build").

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250_uniphier.c

index efd1f9c047b1c0ce0e75d200b07bab8f9a4424a0..b8d9c8c9d02a9762a2be77861554f13e49488a0c 100644 (file)
@@ -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)
 {