From patchwork Wed Feb 3 00:44:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Miao X-Patchwork-Id: 44329 X-Patchwork-Delegate: apw@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 3F237B7D34 for ; Wed, 3 Feb 2010 11:45:20 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NcTMp-0005dD-GR; Wed, 03 Feb 2010 00:45:15 +0000 Received: from qw-out-1920.google.com ([74.125.92.150]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NcTMm-0005d4-NW for kernel-team@lists.ubuntu.com; Wed, 03 Feb 2010 00:45:12 +0000 Received: by qw-out-1920.google.com with SMTP id 4so147306qwk.20 for ; Tue, 02 Feb 2010 16:45:12 -0800 (PST) MIME-Version: 1.0 Received: by 10.229.19.82 with SMTP id z18mr2781468qca.9.1265157912074; Tue, 02 Feb 2010 16:45:12 -0800 (PST) From: Eric Miao Date: Tue, 2 Feb 2010 16:44:52 -0800 X-Google-Sender-Auth: 32b39741aefd25fc Message-ID: Subject: [PATCH 3/3] UBUNTU: [Config]: Turn on CONFIG_HIBERNATE To: Andy Whitcroft Cc: kernel-team@lists.ubuntu.com 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: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com commit baf9e2adc8c3b8e3f5bfc04cc26bfd0a56dec9f6 Author: Eric Miao Date: Tue Feb 2 15:34:04 2010 -0800 UBUNTU: [Config]: Turn on CONFIG_HIBERNATE BugLink: https://bugs.launchpad.net/bugs/502983 Signed-off-by: Eric Miao diff --git a/debian.mvl-dove/config/config.common.ubuntu b/debian.mvl-dove/config/config.common.ubuntu index 09d6326..3b40ee7 100644 --- a/debian.mvl-dove/config/config.common.ubuntu +++ b/debian.mvl-dove/config/config.common.ubuntu @@ -993,7 +993,8 @@ CONFIG_HERMES=m CONFIG_HERMES_CACHE_FW_ON_INIT=y CONFIG_HFSPLUS_FS=m CONFIG_HFS_FS=m -# CONFIG_HIBERNATION is not set +CONFIG_HIBERNATION=y +CONFIG_HIBERNATION_NVS=y CONFIG_HID=y CONFIG_HIDRAW=y CONFIG_HID_A4TECH=m @@ -2102,7 +2103,6 @@ CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PAGE_OFFSET=0xC0000000 -# CONFIG_PAGE_POISONING is not set CONFIG_PANEL=m # CONFIG_PANEL_CHANGE_MESSAGE is not set CONFIG_PANEL_PARPORT=0 @@ -2212,6 +2212,7 @@ CONFIG_PMIC_DA903X=y # CONFIG_PM_DISABLE_CONSOLE is not set # CONFIG_PM_RUNTIME is not set CONFIG_PM_SLEEP=y +CONFIG_PM_STD_PARTITION="" # CONFIG_POCH is not set CONFIG_POHMELFS=m CONFIG_POHMELFS_CRYPTO=y