diff options
Diffstat (limited to 'arch/s390/kernel/setup.c')
-rw-r--r-- | arch/s390/kernel/setup.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 9c92407f625..b358e18273b 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c | |||
@@ -205,12 +205,6 @@ static void __init conmode_default(void) | |||
205 | SET_CONSOLE_SCLP; | 205 | SET_CONSOLE_SCLP; |
206 | #endif | 206 | #endif |
207 | } | 207 | } |
208 | } else if (MACHINE_IS_P390) { | ||
209 | #if defined(CONFIG_TN3215_CONSOLE) | ||
210 | SET_CONSOLE_3215; | ||
211 | #elif defined(CONFIG_TN3270_CONSOLE) | ||
212 | SET_CONSOLE_3270; | ||
213 | #endif | ||
214 | } else { | 208 | } else { |
215 | #if defined(CONFIG_SCLP_CONSOLE) || defined(CONFIG_SCLP_VT220_CONSOLE) | 209 | #if defined(CONFIG_SCLP_CONSOLE) || defined(CONFIG_SCLP_VT220_CONSOLE) |
216 | SET_CONSOLE_SCLP; | 210 | SET_CONSOLE_SCLP; |