diff options
author | Peter Oberparleiter <peter.oberparleiter@de.ibm.com> | 2008-02-05 10:50:41 -0500 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-02-05 10:50:57 -0500 |
commit | 8c0933eeb701eb8f526d88b1915af7bb35748e7b (patch) | |
tree | 37b4fe2a56e24c1209c4385ebcb481bbae871277 /arch/s390/kernel/setup.c | |
parent | 2bc89b5ece48dc888734e8760ba5ad8566431912 (diff) |
[S390] console: allow vt220 console to be the only console
Fix console detection logic to support configurations in which the
vt220 console is the only available Linux console.
Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/setup.c')
-rw-r--r-- | arch/s390/kernel/setup.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 2d266f45e73f..72d20f70f8a6 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c | |||
@@ -145,7 +145,7 @@ __setup("condev=", condev_setup); | |||
145 | 145 | ||
146 | static int __init conmode_setup(char *str) | 146 | static int __init conmode_setup(char *str) |
147 | { | 147 | { |
148 | #if defined(CONFIG_SCLP_CONSOLE) | 148 | #if defined(CONFIG_SCLP_CONSOLE) || defined(CONFIG_SCLP_VT220_CONSOLE) |
149 | if (strncmp(str, "hwc", 4) == 0 || strncmp(str, "sclp", 5) == 0) | 149 | if (strncmp(str, "hwc", 4) == 0 || strncmp(str, "sclp", 5) == 0) |
150 | SET_CONSOLE_SCLP; | 150 | SET_CONSOLE_SCLP; |
151 | #endif | 151 | #endif |
@@ -183,7 +183,7 @@ static void __init conmode_default(void) | |||
183 | */ | 183 | */ |
184 | cpcmd("TERM CONMODE 3215", NULL, 0, NULL); | 184 | cpcmd("TERM CONMODE 3215", NULL, 0, NULL); |
185 | if (ptr == NULL) { | 185 | if (ptr == NULL) { |
186 | #if defined(CONFIG_SCLP_CONSOLE) | 186 | #if defined(CONFIG_SCLP_CONSOLE) || defined(CONFIG_SCLP_VT220_CONSOLE) |
187 | SET_CONSOLE_SCLP; | 187 | SET_CONSOLE_SCLP; |
188 | #endif | 188 | #endif |
189 | return; | 189 | return; |
@@ -193,7 +193,7 @@ static void __init conmode_default(void) | |||
193 | SET_CONSOLE_3270; | 193 | SET_CONSOLE_3270; |
194 | #elif defined(CONFIG_TN3215_CONSOLE) | 194 | #elif defined(CONFIG_TN3215_CONSOLE) |
195 | SET_CONSOLE_3215; | 195 | SET_CONSOLE_3215; |
196 | #elif defined(CONFIG_SCLP_CONSOLE) | 196 | #elif defined(CONFIG_SCLP_CONSOLE) || defined(CONFIG_SCLP_VT220_CONSOLE) |
197 | SET_CONSOLE_SCLP; | 197 | SET_CONSOLE_SCLP; |
198 | #endif | 198 | #endif |
199 | } else if (strncmp(ptr + 8, "3215", 4) == 0) { | 199 | } else if (strncmp(ptr + 8, "3215", 4) == 0) { |
@@ -201,7 +201,7 @@ static void __init conmode_default(void) | |||
201 | SET_CONSOLE_3215; | 201 | SET_CONSOLE_3215; |
202 | #elif defined(CONFIG_TN3270_CONSOLE) | 202 | #elif defined(CONFIG_TN3270_CONSOLE) |
203 | SET_CONSOLE_3270; | 203 | SET_CONSOLE_3270; |
204 | #elif defined(CONFIG_SCLP_CONSOLE) | 204 | #elif defined(CONFIG_SCLP_CONSOLE) || defined(CONFIG_SCLP_VT220_CONSOLE) |
205 | SET_CONSOLE_SCLP; | 205 | SET_CONSOLE_SCLP; |
206 | #endif | 206 | #endif |
207 | } | 207 | } |
@@ -212,7 +212,7 @@ static void __init conmode_default(void) | |||
212 | SET_CONSOLE_3270; | 212 | SET_CONSOLE_3270; |
213 | #endif | 213 | #endif |
214 | } else { | 214 | } else { |
215 | #if defined(CONFIG_SCLP_CONSOLE) | 215 | #if defined(CONFIG_SCLP_CONSOLE) || defined(CONFIG_SCLP_VT220_CONSOLE) |
216 | SET_CONSOLE_SCLP; | 216 | SET_CONSOLE_SCLP; |
217 | #endif | 217 | #endif |
218 | } | 218 | } |