aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/setup.c
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2010-10-29 10:50:35 -0400
committerMartin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com>2010-10-29 10:50:49 -0400
commitc84b9051d6b97d8c6533a194aedcd484c003d278 (patch)
tree535bab2363c361c83f6ba93d479ed838671e9bc0 /arch/s390/kernel/setup.c
parent18cb657ca1bafe635f368346a1676fb04c512edf (diff)
[S390] Add z196 machine type to setup_hwcaps
Add machine type for zEnterprise 196 to elf platform detection. Signed-off-by: Heiko Carstens <heiko.carstens@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.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index e3ceb911dc75..6f6350826c81 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -761,6 +761,9 @@ static void __init setup_hwcaps(void)
761 case 0x2098: 761 case 0x2098:
762 strcpy(elf_platform, "z10"); 762 strcpy(elf_platform, "z10");
763 break; 763 break;
764 case 0x2817:
765 strcpy(elf_platform, "z196");
766 break;
764 } 767 }
765} 768}
766 769