diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2016-01-17 00:23:38 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-07 07:07:37 +0100 |
| commit | 8477614d9f7c5ce0e871e1aa200d9060a6b8749e (patch) | |
| tree | 906f168a2d2a47120c9ccde6b705e9547021785b /drivers/tty/serial/earlycon.c | |
| parent | Merge 4.5-rc2 into tty-next (diff) | |
| download | linux-8477614d9f7c5ce0e871e1aa200d9060a6b8749e.tar.xz linux-8477614d9f7c5ce0e871e1aa200d9060a6b8749e.zip | |
of: earlycon: of_setup_earlycon() requires CONFIG_OF_EARLY_FLATTREE
DT earlycon is only supported for CONFIG_OF_EARLY_FLATTREE=y; exclude
of_setup_earlycon() if not defined.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/earlycon.c')
| -rw-r--r-- | drivers/tty/serial/earlycon.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c index 3f2423690d01..54419a210dc3 100644 --- a/drivers/tty/serial/earlycon.c +++ b/drivers/tty/serial/earlycon.c @@ -204,6 +204,8 @@ static int __init param_setup_earlycon(char *buf) } early_param("earlycon", param_setup_earlycon); +#ifdef CONFIG_OF_EARLY_FLATTREE + int __init of_setup_earlycon(unsigned long addr, int (*setup)(struct earlycon_device *, const char *)) { @@ -227,3 +229,5 @@ int __init of_setup_earlycon(unsigned long addr, register_console(early_console_dev.con); return 0; } + +#endif /* CONFIG_OF_EARLY_FLATTREE */ |