[PATCH 07/22] UBUNTU: [Config] CONFIG_X86_LEGACY_VM86=y, CONFIG_VM86=y for i386

[tim.gardner at canonical.com]

From: Tim Gardner <tim.gardner at canonical.com>

BugLink: http://bugs.launchpad.net/bugs/1499089

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.master/config/amd64/config.common.amd64 | 1 +
 debian.master/config/config.common.ubuntu      | 2 +-
 debian.master/config/i386/config.common.i386   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 9c87910..66144f1 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -142,6 +142,7 @@ CONFIG_USB_HCD_SSB=m
 CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_VFIO_IOMMU_TYPE1=m
+# CONFIG_VM86 is not set
 CONFIG_X86_MINIMUM_CPU_FAMILY=64
 CONFIG_X86_SPEEDSTEP_LIB=m
 CONFIG_XEN=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index d3cf11d..21246e4 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -8612,7 +8612,6 @@ CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VLSI_FIR=m
-# CONFIG_VM86 is not set
 CONFIG_VME_BUS=y
 CONFIG_VME_CA91CX42=m
 CONFIG_VME_PIO2=m
@@ -8782,6 +8781,7 @@ CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_LEGACY_VM86=y
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_LONGHAUL=m
 CONFIG_X86_LONGRUN=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index b11f2ec..8fef2dd 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -142,6 +142,7 @@ CONFIG_USB_HCD_SSB=m
 CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VM86=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=5
 CONFIG_X86_SPEEDSTEP_LIB=y
 CONFIG_XEN=y
-- 
1.9.1