summaryrefslogtreecommitdiff
path: root/recipes/linux
diff options
context:
space:
mode:
authorMichael 'Mickey' Lauer <mickey@vanille-media.de>2010-04-24 15:52:40 +0200
committerMichael 'Mickey' Lauer <mickey@vanille-media.de>2010-04-24 18:47:48 +0200
commit93ab06946ac26a25093873dc388a4a608189329d (patch)
tree7a52a0e4d1f27ba125e4664f3470da99f255b85f /recipes/linux
parent757ec3d76d258c15828de2d85dd8ce9abb4c1323 (diff)
linux-leviathan: bump to a revision that can suspend/resume. Thanks Alain!
Diffstat (limited to 'recipes/linux')
-rw-r--r--recipes/linux/linux-leviathan/defconfig6
-rw-r--r--recipes/linux/linux-leviathan_git.bb10
2 files changed, 8 insertions, 8 deletions
diff --git a/recipes/linux/linux-leviathan/defconfig b/recipes/linux/linux-leviathan/defconfig
index 77838c38df..4ad5d6b4ca 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
-# Mon Apr 12 19:28:58 2010
+# Fri Apr 16 00:42:36 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -954,6 +954,8 @@ CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_TOUCHSCREEN_MK712 is not set
# CONFIG_TOUCHSCREEN_PENMOUNT is not set
CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI=y
+CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI_MT_EXTENSION=y
+# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI_MT_PROTOCOL is not set
# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
@@ -1606,7 +1608,7 @@ CONFIG_DEBUG_KERNEL=y
# CONFIG_DETECT_HUNG_TASK is not set
# CONFIG_SCHED_DEBUG is not set
# CONFIG_SCHEDSTATS is not set
-# CONFIG_TIMER_STATS is not set
+CONFIG_TIMER_STATS=y
# CONFIG_DEBUG_OBJECTS is not set
# CONFIG_SLUB_DEBUG_ON is not set
# CONFIG_SLUB_STATS is not set
diff --git a/recipes/linux/linux-leviathan_git.bb b/recipes/linux/linux-leviathan_git.bb
index 3220d661cd..7ee49a6b56 100644
--- a/recipes/linux/linux-leviathan_git.bb
+++ b/recipes/linux/linux-leviathan_git.bb
@@ -2,15 +2,13 @@ require linux.inc
DEPENDS += "android-image-utils-native"
PV = "2.6.32+${PR}+gitr${SRCREV}"
-PR = "r16"
+PR = "r17"
COMPATIBLE_MACHINE = "htcdream"
-CMDLINE = "console=tty1 no_console_suspend=1 root=/dev/mmcblk0p1 rootdelay=8 fbcon=rotate:1 panic=30 mem=110M"
+CMDLINE = "console=tty1 root=/dev/mmcblk0p1 rootdelay=8 fbcon=rotate:1 panic=30 mem=110M"
-#CMDLINE = "console=tty1 root=/dev/mmcblk0p1 rootdelay=8 fbcon=rotate:1 panic=30 mem=110M earlysuspend.debug_mask=3"
-#SRCREV_LAST_GOOD = "e94465547ea4b765024ff08c36afffb5664f3121"
-
-SRCREV = "2402bb32e564fb3b802c4a23d4a3f1fd0faa8d17"
+SRCREV_LAST_GOOD = "2402bb32e564fb3b802c4a23d4a3f1fd0faa8d17"
+SRCREV = "636fa4daf243826ef6cebb64dd0509f3b079fcb5"
SRC_URI = "\
git://gitorious.org/htc-msm-2-6-32/leviathan-incoming.git;protocol=git;branch=msm-gnuconform \