- up for 3.4

Changed files:
    kernel-multiarch.config -> 1.90
    kernel-x86.config -> 1.43

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index a0022c7df91679d5edddd3bfafd8cb0ff6d442f1..196d965c1338c6cae934feda04348e4b1bb51266 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -5497,7 +5497,7 @@ FB_XGI all=m
 #-
 #- *** FILE: drivers/staging/zcache/Kconfig ***
 #-
-ZCACHE all=m
+ZCACHE all=y
 
 #-
 #- *** FILE: drivers/staging/zram/Kconfig ***

diff --git a/kernel-x86.config b/kernel-x86.config
index 384a49a5e595f1a134f7d88acec439acd618dbb6..2ffc77cfc19adfb769775137b0e57eae8df30db4 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -23,7 +23,6 @@ X86_EXTENDED_PLATFORM i386=y x86_64=y
 X86_NUMACHIP all=n
 X86_VSMP x86_64=n
 X86_UV i386=n x86_64=n
-X86_MRST i386=y
 X86_RDC321X i386=n
 X86_32_NON_STANDARD i386=y
 X86_NUMAQ i386=n
@@ -139,6 +138,7 @@ OLPC i386=n
 #- file fs/Kconfig.binfmt goes here
 IA32_EMULATION x86_64=y
 IA32_AOUT x86_64=y
+X86_X32 all=n
 #- file net/Kconfig goes here
 #- file drivers/Kconfig goes here
 #- file drivers/firmware/Kconfig goes here
@@ -277,3 +277,4 @@ DEBUG_PER_CPU_MAPS x86=n
 #- *** PROBABLY REMOVED OPTIONS ***
 #-
 EARLY_PRINTK_MRST x86=n
+X86_MRST i386=y