summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--recipes/linux/linux/spitz/defconfig9
-rw-r--r--recipes/linux/linux_git.bb4
2 files changed, 4 insertions, 9 deletions
diff --git a/recipes/linux/linux/spitz/defconfig b/recipes/linux/linux/spitz/defconfig
index 438b8c6a8b..6b7d13213e 100644
--- a/recipes/linux/linux/spitz/defconfig
+++ b/recipes/linux/linux/spitz/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.34-rc6
-# Tue May 4 11:22:29 2010
+# Linux kernel version: 2.6.34
+# Mon May 17 09:31:07 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -390,11 +390,6 @@ CONFIG_ATAGS_PROC=y
# CPU Power Management
#
# CONFIG_CPU_FREQ is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
# CONFIG_CPU_IDLE is not set
#
diff --git a/recipes/linux/linux_git.bb b/recipes/linux/linux_git.bb
index 2af35b355d..5bbf8988c5 100644
--- a/recipes/linux/linux_git.bb
+++ b/recipes/linux/linux_git.bb
@@ -1,7 +1,7 @@
require linux.inc
-KERNEL_RELEASE = "2.6.34-rc6"
-SRCREV = "be1066bbcd443a65df312fdecea7e4959adedb45"
+KERNEL_RELEASE = "2.6.34"
+SRCREV = "e40152ee1e1c7a63f4777791863215e3faa37a86"
PV = "${KERNEL_RELEASE}+gitr${SRCPV}"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;branch=master \