From patchwork Mon Aug 23 22:36:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 62522 X-Patchwork-Delegate: leann.ogasawara@canonical.com 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 9F861B70A8 for ; Tue, 24 Aug 2010 08:37:17 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Onfdg-000182-RB; Mon, 23 Aug 2010 23:37:12 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Onfde-00014P-2d for kernel-team@lists.ubuntu.com; Mon, 23 Aug 2010 23:37:10 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1Onfdd-0008Nf-Vu for ; Mon, 23 Aug 2010 23:37:10 +0100 Received: from c-76-105-148-120.hsd1.or.comcast.net ([76.105.148.120] helo=localhost) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1Onfdd-0001Ph-IL for kernel-team@lists.ubuntu.com; Mon, 23 Aug 2010 23:37:09 +0100 From: leann.ogasawara@canonical.com To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] UBUNTU: [Config] Build in intel_idle Date: Mon, 23 Aug 2010 15:36:59 -0700 Message-Id: X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 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 BugLink: http://bugs.launchpad.net/bugs/615265 We originally had intel_idle enabled as a module. However, build this in for now per the following upstream commit: commit a45b78e2fa523fba670540ae15fefbbd5933c7c2 Author: Len Brown Date: Sat Aug 14 14:40:36 2010 -0400 intel_idle: disable module support Right now the module capability is cauing more trouble than it is worth. At least one distro built intel_idle as a module where it lost the init race with ACPI, making it useless. Make intel_idle bool so that if you select it, you will use it. We can restore module capability after cpuidle is enhanced to handle run-time changing of idle drivers. Signed-off-by: Leann Ogasawara --- debian.master/config/config.common.ubuntu | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 4757304..86962b4 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1972,7 +1972,7 @@ CONFIG_INPUT_WISTRON_BTNS=m CONFIG_INPUT_WM831X_ON=m CONFIG_INPUT_YEALINK=m CONFIG_INSTRUCTION_DECODER=y -CONFIG_INTEL_IDLE=m +CONFIG_INTEL_IDLE=y CONFIG_INTEL_IOATDMA=m CONFIG_INTEL_IPS=m CONFIG_INTEL_MENLOW=m