summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-09 07:08:37 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-09 07:08:37 +0100
commitbecba85f0e1ca8ab97bd7e836a7129a94ace1ff2 (patch)
tree3a43cb5edc60310c89790ab0961f5276bd9ca615 /kernel
parent9eccca0843205f87c00404b663188b88eb248051 (diff)
parent3372ec28622083ac87daf18918a222fbee06f6f9 (diff)
downloadop-kernel-dev-becba85f0e1ca8ab97bd7e836a7129a94ace1ff2.zip
op-kernel-dev-becba85f0e1ca8ab97bd7e836a7129a94ace1ff2.tar.gz
Merge 4.0-rc3 into tty-testing
This resolves a merge issue in drivers/tty/serial/8250/8250_pci.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/printk/printk.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index bb0635b..26f8998 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2480,7 +2480,6 @@ void register_console(struct console *newcon)
newcon->setup(newcon, console_cmdline[i].options) != 0)
break;
newcon->flags |= CON_ENABLED;
- newcon->index = c->index;
if (i == selected_console) {
newcon->flags |= CON_CONSDEV;
preferred_console = selected_console;
OpenPOWER on IntegriCloud