Merge tag 'pinctrl-v4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[karo-tx-linux.git] / drivers / s390 / char / sclp_con.c

diff --git a/drivers/s390/char/sclp_con.c b/drivers/s390/char/sclp_con.c
index 5880def98fc1be4dbfedbfa166d725a52ffc35c2..6037bc87e767380695a0ebe09b0fcb78ee2d69ea 100644 (file)
--- a/drivers/s390/char/sclp_con.c
+++ b/drivers/s390/char/sclp_con.c
@@ -319,7 +319,8 @@ sclp_console_init(void)
        int i;
        int rc;
 
-       if (!CONSOLE_IS_SCLP)
+       /* SCLP consoles are handled together */
+       if (!(CONSOLE_IS_SCLP || CONSOLE_IS_VT220))
                return 0;
        rc = sclp_rw_init();
        if (rc)