kernel: Update to 3.14.2.

[people/amarx/ipfire-3.x.git] / kernel / config-i686-default

diff --git a/kernel/config-i686-default b/kernel/config-i686-default
index 7d39dde950d885e7ea165979a4d1597f89344843..9f81e2121949fc15b5f742bfb41adb204d5ec377 100644 (file)
--- a/kernel/config-i686-default
+++ b/kernel/config-i686-default
@@ -48,7 +48,7 @@ CONFIG_LBDAF=y
 #
 CONFIG_X86_BIGSMP=y
 # CONFIG_X86_GOLDFISH is not set
-# CONFIG_X86_WANT_INTEL_MID is not set
+# CONFIG_X86_INTEL_MID is not set
 # CONFIG_X86_RDC321X is not set
 CONFIG_X86_32_NON_STANDARD=y
 # CONFIG_X86_NUMAQ is not set
@@ -113,7 +113,7 @@ CONFIG_SPARSEMEM_STATIC=y
 CONFIG_HIGHPTE=y
 # CONFIG_MATH_EMULATION is not set
 CONFIG_PHYSICAL_START=0x400000
-CONFIG_X86_NEED_RELOCS=y
+CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x20000000
 CONFIG_PHYSICAL_ALIGN=0x400000
 
 #