diff options
| author | Petr Mladek <pmladek@suse.com> | 2020-08-04 17:27:43 +0300 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2020-08-04 17:27:43 +0300 |
| commit | 57e60db3bc4d2755aefe5abd1024662f478770ac (patch) | |
| tree | 8ef1fd13a622567bc3867fc37874780650a7a97e /drivers/tty/hvc/hvc_xen.c | |
| parent | 30d497a0e1aadd904867081246c310dd0284eb41 (diff) | |
| parent | 6f2fdb298bf8e3207d060d57f2565b13d9300d2f (diff) | |
| download | linux-57e60db3bc4d2755aefe5abd1024662f478770ac.tar.xz | |
Merge branch 'for-5.9-console-return-codes' into for-linus
Diffstat (limited to 'drivers/tty/hvc/hvc_xen.c')
| -rw-r--r-- | drivers/tty/hvc/hvc_xen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c index 5ef08905fe05..2a0e51a20e34 100644 --- a/drivers/tty/hvc/hvc_xen.c +++ b/drivers/tty/hvc/hvc_xen.c @@ -603,7 +603,7 @@ static void xen_hvm_early_write(uint32_t vtermno, const char *str, int len) { } #endif #ifdef CONFIG_EARLY_PRINTK -static int __init xenboot_setup_console(struct console *console, char *string) +static int __init xenboot_console_setup(struct console *console, char *string) { static struct xencons_info xenboot; @@ -647,7 +647,7 @@ static void xenboot_write_console(struct console *console, const char *string, struct console xenboot_console = { .name = "xenboot", .write = xenboot_write_console, - .setup = xenboot_setup_console, + .setup = xenboot_console_setup, .flags = CON_PRINTBUFFER | CON_BOOT | CON_ANYTIME, .index = -1, }; |