diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-06 20:28:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-06 20:28:16 -0400 |
| commit | 97a7729a5c2f01faa076f38a7ec010961b456823 (patch) | |
| tree | d1aaecf81d1357b5920579347e6bb894b4bfe11c /drivers/tty/hvc | |
| parent | 9987f76ad286887978803ece6cdcf34582279a29 (diff) | |
| parent | d0e639c9e06d44e713170031fe05fb60ebe680af (diff) | |
Merge 3.12-rc4 into tty-next
We want the tty fixes in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/hvc')
| -rw-r--r-- | drivers/tty/hvc/hvc_xen.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c index e61c36cbb866..c193af6a628f 100644 --- a/drivers/tty/hvc/hvc_xen.c +++ b/drivers/tty/hvc/hvc_xen.c | |||
| @@ -636,6 +636,7 @@ struct console xenboot_console = { | |||
| 636 | .name = "xenboot", | 636 | .name = "xenboot", |
| 637 | .write = xenboot_write_console, | 637 | .write = xenboot_write_console, |
| 638 | .flags = CON_PRINTBUFFER | CON_BOOT | CON_ANYTIME, | 638 | .flags = CON_PRINTBUFFER | CON_BOOT | CON_ANYTIME, |
| 639 | .index = -1, | ||
| 639 | }; | 640 | }; |
| 640 | #endif /* CONFIG_EARLY_PRINTK */ | 641 | #endif /* CONFIG_EARLY_PRINTK */ |
| 641 | 642 | ||