---

yaml --- r: 262395 b: refs/heads/master c: 3a81b17 h: refs/heads/master i: 262393: a438bdc 262391: 6d05d45 v: v3
git-mirror · Aug 3, 2011 · ed3a3f8 · ed3a3f8
1 parent ad00b15
commit ed3a3f8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34cd551a31cd4e35cd3f9ed9f13bb46b4ee98508
+refs/heads/master: 3a81b171429113ae0af2920f5d4ecfe571230627
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
@@ -273,11 +273,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
 

diff --git a/trunk/arch/s390/kernel/setup.c b/trunk/arch/s390/kernel/setup.c
@@ -752,6 +752,7 @@ static void __init setup_hwcaps(void)
 		strcpy(elf_platform, "z10");
 		break;
 	case 0x2817:
+	case 0x2818:
 		strcpy(elf_platform, "z196");
 		break;
 	}