[S390] Add support for IBM zEnterprise 114

Just fix up the Kconfig description and the elf platform. Signed-off-by: Heiko Carstens <[email protected]>
yshchan · Aug 3, 2011 · 3a81b17 · 3a81b17
1 parent 34cd551
commit 3a81b17
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/arch/s390/Kconfig b/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/arch/s390/kernel/setup.c b/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;
 	}