aboutsummaryrefslogtreecommitdiff
path: root/debian.master
diff options
context:
space:
mode:
authorTim Gardner <tim.gardner@canonical.com>2011-06-29 08:19:00 -0600
committerJohn Rigby <john.rigby@linaro.org>2011-07-25 14:40:46 -0600
commit7aac2b49a5367008a7dc55285cf336a51407c26e (patch)
treef07b40b358e3294b2a4dd82255f46538300fe5e7 /debian.master
parent6c7a6927f6728add1fd5baa82b4c2bca30519e92 (diff)
UBUNTU: [Config] CONFIG_INTEL_MEI=m
BugLink: http://bugs.launchpad.net/bugs/716867 Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'debian.master')
-rw-r--r--debian.master/config/config.common.ubuntu2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index ec0997d6260..641fe51cae6 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2242,7 +2242,7 @@ CONFIG_INPUT_YEALINK=m
CONFIG_INSTRUCTION_DECODER=y
CONFIG_INTEL_IOATDMA=m
CONFIG_INTEL_IPS=m
-# CONFIG_INTEL_MEI is not set
+CONFIG_INTEL_MEI=m
CONFIG_INTEL_MENLOW=m
CONFIG_INTEL_MID_DMAC=m
CONFIG_INTEL_MID_PTI=m