summaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2017-04-12 18:37:14 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-04-18 18:01:52 +0200
commit0c688614dcce84dfdbb305fd1c399c06cecea745 (patch)
tree5d96d52fe1b750645adb8c9b433bb98e6c801015 /init/main.c
parent72f1b85a045e3db4d21e9531bdc605157fa224a7 (diff)
downloadlinux-0c688614dcce84dfdbb305fd1c399c06cecea745.tar.bz2
console: move console_init() out of tty_io.c
All the console driver handling code lives in printk.c. Move console_init() there as well so console support can still be used when the TTY code is configured out. No logical changes from this patch. Signed-off-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c
index b0c11cbf5ddf..cfb7e6821b85 100644
--- a/init/main.c
+++ b/init/main.c
@@ -27,7 +27,7 @@
#include <linux/initrd.h>
#include <linux/bootmem.h>
#include <linux/acpi.h>
-#include <linux/tty.h>
+#include <linux/console.h>
#include <linux/nmi.h>
#include <linux/percpu.h>
#include <linux/kmod.h>