projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.10.13' into lsk/v3.10/topic/kvm
[firefly-linux-kernel-4.4.55.git]
/
arch
/
s390
/
kernel
/
setup.c
diff --git
a/arch/s390/kernel/setup.c
b/arch/s390/kernel/setup.c
index 0a49095104c910f238cd9b28a9c79cf7a9958efc..8ad9413148bf20b01eafc9dff8a4fdc09fa01d3a 100644
(file)
--- a/
arch/s390/kernel/setup.c
+++ b/
arch/s390/kernel/setup.c
@@
-998,6
+998,7
@@
static void __init setup_hwcaps(void)
strcpy(elf_platform, "z196");
break;
case 0x2827:
+ case 0x2828:
strcpy(elf_platform, "zEC12");
break;
}