summaryrefslogtreecommitdiffstats
path: root/drivers/tty/hvc
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-06 17:28:16 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-06 17:28:16 -0700
commit97a7729a5c2f01faa076f38a7ec010961b456823 (patch)
treed1aaecf81d1357b5920579347e6bb894b4bfe11c /drivers/tty/hvc
parent9987f76ad286887978803ece6cdcf34582279a29 (diff)
parentd0e639c9e06d44e713170031fe05fb60ebe680af (diff)
downloadblackbird-op-linux-97a7729a5c2f01faa076f38a7ec010961b456823.tar.gz
blackbird-op-linux-97a7729a5c2f01faa076f38a7ec010961b456823.zip
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.c1
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 = {
.name = "xenboot",
.write = xenboot_write_console,
.flags = CON_PRINTBUFFER | CON_BOOT | CON_ANYTIME,
+ .index = -1,
};
#endif /* CONFIG_EARLY_PRINTK */
OpenPOWER on IntegriCloud