[oe-commits] Michael 'Mickey' Lauer : linux-leviathan: fix suspend/resume

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: e36460c470bcf8de321de2d483ecf0e2e2c4229a
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e36460c470bcf8de321de2d483ecf0e2e2c4229a

Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Wed Mar 31 18:51:50 2010 +0200

linux-leviathan: fix suspend/resume

Note to self: hand-editing defconfig and multistate configs doesn't match

---

 recipes/linux/linux-leviathan/defconfig |    4 ++--
 recipes/linux/linux-leviathan_git.bb    |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes/linux/linux-leviathan/defconfig b/recipes/linux/linux-leviathan/defconfig
index f24a1ad..db0def5 100644
--- a/recipes/linux/linux-leviathan/defconfig
+++ b/recipes/linux/linux-leviathan/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32
-# Sat Mar 27 16:48:03 2010
+# Wed Mar 31 18:39:17 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -373,7 +373,7 @@ CONFIG_USER_WAKELOCK=y
 CONFIG_EARLYSUSPEND=y
 # CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set
 CONFIG_CONSOLE_EARLYSUSPEND=y
-CONFIG_FB_EARLYSUSPEND=y
+# CONFIG_FB_EARLYSUSPEND is not set
 # CONFIG_APM_EMULATION is not set
 # CONFIG_PM_RUNTIME is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
diff --git a/recipes/linux/linux-leviathan_git.bb b/recipes/linux/linux-leviathan_git.bb
index 82e8502..77c9c0d 100644
--- a/recipes/linux/linux-leviathan_git.bb
+++ b/recipes/linux/linux-leviathan_git.bb
@@ -2,7 +2,7 @@ require linux.inc
 DEPENDS = "android-image-utils-native"
 
 PV = "2.6.32+${PR}+gitr${SRCREV}"
-PR = "r3"
+PR = "r4"
 
 COMPATIBLE_MACHINE = "htcdream"
 CMDLINE = "console=tty0 no_console_suspend=1 root=/dev/mmcblk0p1 rootdelay=8 fbcon=rotate:1 panic=30 mem=110M"