From 46d92950982445f037b7397492fc69b981104ebf Mon Sep 17 00:00:00 2001 From: Martin Schwidefsky Date: Thu, 25 Dec 2008 13:39:22 +0100 Subject: [PATCH] --- yaml --- r: 121404 b: refs/heads/master c: 9fee8db222a344b9ee407fad9c652ed823690788 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/setup.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a0c61595ed52..cf60f9e5b142 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c58d92b233a41b81fbbea6add4ba1b512784f837 +refs/heads/master: 9fee8db222a344b9ee407fad9c652ed823690788 diff --git a/trunk/arch/s390/kernel/setup.c b/trunk/arch/s390/kernel/setup.c index a0d44bc0c389..323dedecdf54 100644 --- a/trunk/arch/s390/kernel/setup.c +++ b/trunk/arch/s390/kernel/setup.c @@ -722,8 +722,13 @@ static void __init setup_hwcaps(void) strcpy(elf_platform, "z990"); break; case 0x2094: + case 0x2096: strcpy(elf_platform, "z9-109"); break; + case 0x2097: + case 0x2098: + strcpy(elf_platform, "z10"); + break; } }