summaryrefslogtreecommitdiff
path: root/drivers/s390
diff options
context:
space:
mode:
authorPeter Oberparleiter <oberpar@linux.vnet.ibm.com>2014-06-04 19:01:57 +0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2014-06-10 12:48:29 +0400
commitf2485f5d1c62bb8cccd452616892cdaf2466a090 (patch)
tree2e742694205842229f90287e8f09af645f75e50e /drivers/s390
parent92bdae5d9c95c9dece7886cbdf1f50548b44e60a (diff)
downloadlinux-f2485f5d1c62bb8cccd452616892cdaf2466a090.tar.xz
s390/sclp_vt220: Enable ASCII console per default
When you want to use the HMC's ASCII console as console device for a z/VM guest you have to specify console=ttyS1 on the kernel command line. But it won't work until you specify conmode=sclp as well. This behavior is inconsistent with the use of the ASCII console as TTY device which works on z/VM without the need to specify a conmode. Fix this inconsistency by removing the check for conmode=sclp in the ASCII console registration function. Signed-off-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/char/sclp_vt220.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c
index cd9c91909596..b9a9f721716d 100644
--- a/drivers/s390/char/sclp_vt220.c
+++ b/drivers/s390/char/sclp_vt220.c
@@ -838,8 +838,6 @@ sclp_vt220_con_init(void)
{
int rc;
- if (!CONSOLE_IS_SCLP)
- return 0;
rc = __sclp_vt220_init(sclp_console_pages);
if (rc)
return rc;