From patchwork Wed Jul 11 05:11:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan Wu X-Patchwork-Id: 170357 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 19C702C0080 for ; Wed, 11 Jul 2012 15:24:07 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SopF6-0000fQ-MO; Wed, 11 Jul 2012 05:13:40 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SopF4-0000eX-Fu for kernel-team@lists.ubuntu.com; Wed, 11 Jul 2012 05:13:38 +0000 Received: from [101.224.51.72] (helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SopEy-0007ks-A8; Wed, 11 Jul 2012 05:13:33 +0000 From: Bryan Wu To: tim.gardner@canonical.com, apw@canonical.com, kernel-team@lists.ubuntu.com Subject: [PATCH 6/9] UBUNTU: [Config] disable CONFIG_INTEL_MEI as it is experimental Date: Wed, 11 Jul 2012 13:11:35 +0800 Message-Id: <1341983498-27856-7-git-send-email-bryan.wu@canonical.com> X-Mailer: git-send-email 1.7.11.1 In-Reply-To: <1341983498-27856-1-git-send-email-bryan.wu@canonical.com> References: <1341983498-27856-1-git-send-email-bryan.wu@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Signed-off-by: Bryan Wu --- debian.master/config/config.common.ubuntu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 86981c4..0d60212 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2528,7 +2528,7 @@ CONFIG_INTEL_IOMMU=y # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_INTEL_IOMMU_FLOPPY_WA=y CONFIG_INTEL_IPS=m -CONFIG_INTEL_MEI=m +# CONFIG_INTEL_MEI is not set CONFIG_INTEL_MENLOW=m CONFIG_INTEL_MFLD_THERMAL=m CONFIG_INTEL_MID_DMAC=m