2 files changed, 0 insertions, 10 deletions

diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index 4c0ec7b46e3..2a2ca268b1d 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -183,10 +183,6 @@ static noinline __init void detect_machine_type(void)
         if (cpuinfo->cpu_id.version == 0xff)
                 machine_flags |= MACHINE_FLAG_VM;
 
-        /* Running on a P/390 ? */
-        if (cpuinfo->cpu_id.machine == 0x7490)
-                machine_flags |= MACHINE_FLAG_P390;
-
         /* Running under KVM ? */
         if (cpuinfo->cpu_id.version == 0xfe)
                 machine_flags |= MACHINE_FLAG_KVM;
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)
                         SET_CONSOLE_SCLP;
 #endif
                 }
-        } else if (MACHINE_IS_P390) {
-#if defined(CONFIG_TN3215_CONSOLE)
-                SET_CONSOLE_3215;
-#elif defined(CONFIG_TN3270_CONSOLE)
-                SET_CONSOLE_3270;
-#endif
         } else {
 #if defined(CONFIG_SCLP_CONSOLE) || defined(CONFIG_SCLP_VT220_CONSOLE)
                 SET_CONSOLE_SCLP;