summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2016-01-17 02:23:41 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-07 09:07:37 +0300
commit05d961320ba624c98b16d72b32f947307674b341 (patch)
treef67a57f0a7d8152957461434cf9c4169f48374f4 /include/linux
parentcda64e68240265752c6db22a75f28707dfaf6563 (diff)
downloadlinux-05d961320ba624c98b16d72b32f947307674b341.tar.xz
of: earlycon: Fixup earlycon console name and index
Use the console name embedded in the OF earlycon table by the OF_EARLYCON_DECLARE() macro to initialize the struct console 'name' and 'index' fields. Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/serial_core.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 25e05147f379..63fdb55e4c9d 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -359,8 +359,7 @@ extern const struct earlycon_id __earlycon_table_end[];
#define EARLYCON_DECLARE(_name, fn) OF_EARLYCON_DECLARE(_name, "", fn)
extern int setup_earlycon(char *buf);
-extern int of_setup_earlycon(unsigned long addr,
- int (*setup)(struct earlycon_device *, const char *));
+extern int of_setup_earlycon(unsigned long addr, const struct earlycon_id *match);
struct uart_port *uart_get_console(struct uart_port *ports, int nr,
struct console *c);