diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2010-10-29 16:50:35 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2010-10-29 16:50:49 +0200 |
| commit | c84b9051d6b97d8c6533a194aedcd484c003d278 (patch) | |
| tree | 535bab2363c361c83f6ba93d479ed838671e9bc0 /arch/s390 | |
| parent | Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linu... (diff) | |
| download | linux-c84b9051d6b97d8c6533a194aedcd484c003d278.tar.xz linux-c84b9051d6b97d8c6533a194aedcd484c003d278.zip | |
[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')
| -rw-r--r-- | arch/s390/kernel/setup.c | 3 |
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) case 0x2098: strcpy(elf_platform, "z10"); break; + case 0x2817: + strcpy(elf_platform, "z196"); + break; } } |