aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/linux
diff options
context:
space:
mode:
authorMichael 'Mickey' Lauer <mickey@vanille-media.de>2010-03-31 18:51:50 +0200
committerMichael 'Mickey' Lauer <mickey@vanille-media.de>2010-03-31 18:52:30 +0200
commite36460c470bcf8de321de2d483ecf0e2e2c4229a (patch)
treee9e5805b608a076c7f8970818c2d93dc2123c5e5 /recipes/linux
parente2331268d0927708fde26223153e9d61bfe29012 (diff)
downloadopenembedded-e36460c470bcf8de321de2d483ecf0e2e2c4229a.tar.gz
linux-leviathan: fix suspend/resume
Note to self: hand-editing defconfig and multistate configs doesn't match
Diffstat (limited to 'recipes/linux')
-rw-r--r--recipes/linux/linux-leviathan/defconfig4
-rw-r--r--recipes/linux/linux-leviathan_git.bb2
2 files changed, 3 insertions, 3 deletions
diff --git a/recipes/linux/linux-leviathan/defconfig b/recipes/linux/linux-leviathan/defconfig
index f24a1ad972..db0def5437 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 82e85029d9..77c9c0dae5 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"