diff mbox

[3/3] UBUNTU: [Config]: Turn on CONFIG_HIBERNATE

Message ID f17812d71002021644t222f0d6aob393ae90cf17fd2b@mail.gmail.com
State Accepted
Delegated to: Andy Whitcroft
Headers show

Commit Message

Eric Miao Feb. 3, 2010, 12:44 a.m. UTC 
commit baf9e2adc8c3b8e3f5bfc04cc26bfd0a56dec9f6
Author: Eric Miao <eric.miao@canonical.com>
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 <eric.miao@canonical.com>

Comments

Andy Whitcroft Feb. 3, 2010, 2:17 p.m. UTC | #1 
Applied to Lucid.

-apw
diff mbox

Patch

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