commit c84b9051d6b97d8c6533a194aedcd484c003d278
author Heiko Carstens <heiko.carstens@de.ibm.com> Fri Oct 29 16:50:35 2010 +0200
committer Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> Fri Oct 29 16:50:49 2010 +0200
tree 535bab2363c361c83f6ba93d479ed838671e9bc0
parent 18cb657ca1bafe635f368346a1676fb04c512edf

[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>

arch/s390/kernel/setup.c

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index e3ceb91..6f63508 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -761,6 +761,9 @@
 	case 0x2098:
 		strcpy(elf_platform, "z10");
 		break;
+	case 0x2817:
+		strcpy(elf_platform, "z196");
+		break;
 	}
 }