UBUNTU: [Config] normalise CONFIG_INTEL_TXT

Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 213834a..5e56b86 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -142,6 +142,7 @@ CONFIG_IGB=m
 CONFIG_IIO=m
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_INTEL_TXT=y
 CONFIG_INTR_REMAP=y
 CONFIG_IOMMU_HELPER=y
 CONFIG_IPMI_HANDLER=m

diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic
index f3bc678..58adfb5 100644 (file)
--- a/debian.master/config/amd64/config.flavour.generic
+++ b/debian.master/config/amd64/config.flavour.generic
@@ -5,7 +5,6 @@ CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_INTEL_IDLE=y
-CONFIG_INTEL_TXT=y
 # CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_NR_CPUS=64
 # CONFIG_PREEMPT_NONE is not set

diff --git a/debian.master/config/amd64/config.flavour.server b/debian.master/config/amd64/config.flavour.server
index c94463b..fa42131 100644 (file)
--- a/debian.master/config/amd64/config.flavour.server
+++ b/debian.master/config/amd64/config.flavour.server
@@ -5,7 +5,6 @@
 CONFIG_DEFAULT_DEADLINE=y
 CONFIG_DEFAULT_IOSCHED="deadline"
 CONFIG_INTEL_IDLE=y
-# CONFIG_INTEL_TXT is not set
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_NR_CPUS=256
 CONFIG_PREEMPT_NONE=y

diff --git a/debian.master/config/amd64/config.flavour.virtual b/debian.master/config/amd64/config.flavour.virtual
index 231e6bf..ed3931c 100644 (file)
--- a/debian.master/config/amd64/config.flavour.virtual
+++ b/debian.master/config/amd64/config.flavour.virtual
@@ -5,7 +5,6 @@
 CONFIG_DEFAULT_DEADLINE=y
 CONFIG_DEFAULT_IOSCHED="deadline"
 # CONFIG_INTEL_IDLE is not set
-# CONFIG_INTEL_TXT is not set
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_NR_CPUS=64
 CONFIG_PREEMPT_NONE=y