From dbc783c06b37e489847c193c2f0d665a565efc68 Mon Sep 17 00:00:00 2001
From: Kamal Mostafa <kamal@canonical.com>
Date: Fri, 17 Oct 2014 09:43:54 -0700
Subject: UBUNTU: [Config] updateconfigs - enable X86_16BIT and ESPFIX
BugLink: http://bugs.launchpad.net/bugs/1328965
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
debian.master/config/config.common.ubuntu | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
@@ -5925,7 +5925,7 @@ CONFIG_WM831X_WATCHDOG=m
CONFIG_WM8350_POWER=m
CONFIG_X25=m
CONFIG_X86=y
-# CONFIG_X86_16BIT is not set
+CONFIG_X86_16BIT=y
CONFIG_X86_32_IRIS=m
# CONFIG_X86_32_NON_STANDARD is not set
CONFIG_X86_32_SMP=y
@@ -5945,6 +5945,8 @@ CONFIG_X86_CPUFREQ_NFORCE2=y
CONFIG_X86_CPUID=m
CONFIG_X86_DEBUGCTLMSR=y
# CONFIG_X86_DECODER_SELFTEST is not set
+CONFIG_X86_ESPFIX32=y
+CONFIG_X86_ESPFIX64=y
CONFIG_X86_EXTENDED_PLATFORM=y
# CONFIG_X86_E_POWERSAVER is not set
CONFIG_X86_GENERIC=y
--
1.9.1