diff options
| author | Linus Torvalds | 2011-08-04 18:35:51 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2011-08-04 18:35:51 +0200 |
| commit | 447e1363bc2cc80fa9205a51a4f86d83c35b54a4 (patch) | |
| tree | 2ef6cba5de8b0e68e141d0e5330539962ed2bf48 /arch/s390/Kconfig | |
| parent | eisa/pci_eisa.c: fix BUG introduced by 005bdad7b80 (diff) | |
| parent | [S390] signal: use set_restore_sigmask() helper (diff) | |
| download | kernel-qcow2-linux-447e1363bc2cc80fa9205a51a4f86d83c35b54a4.tar.gz kernel-qcow2-linux-447e1363bc2cc80fa9205a51a4f86d83c35b54a4.tar.xz kernel-qcow2-linux-447e1363bc2cc80fa9205a51a4f86d83c35b54a4.zip | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] signal: use set_restore_sigmask() helper
[S390] smp: remove pointless comments in startup_secondary()
[S390] qdio: Use kstrtoul_from_user
[S390] sclp_async: Use kstrtoul_from_user
[S390] exec: remove redundant set_fs(USER_DS)
[S390] cpu hotplug: on cpu start wait until being marked active
[S390] signal: convert to use set_current_blocked()
[S390] asm offsets: fix coding style
[S390] Add support for IBM zEnterprise 114
[S390] dasd: check if raw track access is supported
[S390] Use diagnose 308 for system reset
[S390] Export store_status() function
[S390] dasd: use vmalloc for statistics input buffer
[S390] Add PSW restart shutdown trigger
[S390] missing return in page_table_alloc_pgste
[S390] qdio: 2nd stage retry on SIGA-W busy conditions
Diffstat (limited to 'arch/s390/Kconfig')
| -rw-r--r-- | arch/s390/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 0f98bbddade5..ed5cb5af5281 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -274,11 +274,11 @@ config MARCH_Z10 on older machines. config MARCH_Z196 - bool "IBM zEnterprise 196" + bool "IBM zEnterprise 114 and 196" help - Select this to enable optimizations for IBM zEnterprise 196 - (2817 series). The kernel will be slightly faster but will not work - on older machines. + Select this to enable optimizations for IBM zEnterprise 114 and 196 + (2818 and 2817 series). The kernel will be slightly faster but will + not work on older machines. endchoice |