diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-06-06 18:41:01 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-25 14:31:04 -0700 |
| commit | 68b780598d75fb2be80d70034ec7b46e4fe712da (patch) | |
| tree | 0c5c5a9fade3fe4f2308de57fe7ebc26e2854d55 /drivers/tty | |
| parent | f8ba3647f30ab22daeb5110453e2dad8a2c1d841 (diff) | |
| download | linux-68b780598d75fb2be80d70034ec7b46e4fe712da.tar.gz linux-68b780598d75fb2be80d70034ec7b46e4fe712da.tar.bz2 linux-68b780598d75fb2be80d70034ec7b46e4fe712da.zip | |
serial: 8250_uniphier: drop !defined(MODULE) conditional
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>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/8250/8250_uniphier.c | 2 |
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 efd1f9c047b1..b8d9c8c9d02a 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) { |