From: Koen Kooi <koen@openembedded.org>
Date: Sun, 20 Apr 2008 13:04:56 +0000 (+0000)
Subject: linux-omap2: bump to 2.6.25
X-Git-Tag: Release-2010-05/1~7162
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05317c6bbf3abd2dd2460cbbd7b8d176163e59e4;p=openembedded.git

linux-omap2: bump to 2.6.25
---

diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index 75c17eea10..308e23e89c 100644
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -2,15 +2,18 @@ require linux-omap.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
 
-SRCREV = "8eef374ecb0010acceda6571a46be131f1dc0b86"
-PV = "2.6.24+2.6.25rc9-git${SRCREV}"
+SRCREV = "e015fc7dba8f5002daa0982eb81d33cc72e68e95"
+
+# The e105fc commit is the merge of 2.6.25 into the omap tree, so we leave of the +git part of PV  
+#PV = "2.6.25+git${SRCREV}"
+PV = "2.6.25"
 PR = "r4"
 
 
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
            file://defconfig"
 
-SRC_URI_append_beagleboard = " file://1-rearrange-omap3.patch;patch=1 \
+SRC_URI_append_beagleboard = " \
                                file://2-update-omap3evm-kconfig.patch;patch=1 \
                                file://3-omap3evm-board.patch;patch=1 \
                                file://4-omap3evm-config.patch;patch=1 \