summaryrefslogtreecommitdiff
path: root/packages/linux/linux-omap2_git.bb
diff options
context:
space:
mode:
authorRobert Schuster <thebohemian@gmx.net>2008-05-15 14:56:24 +0000
committerRobert Schuster <thebohemian@gmx.net>2008-05-15 14:56:24 +0000
commit306d6ef13632324a116f6064536ee7833e34eff2 (patch)
tree7ae57e3789f7eba4671978b1902497f7a526316f /packages/linux/linux-omap2_git.bb
parent574c1e6c16225cce6ac759ff4003a058fb173bda (diff)
parent0d53bfd6ace8b54cd820a73bfa313fb2aa34a069 (diff)
merge of '57cc0ea5ac2c9fcb954fde9648313ceb7c4c1289'
and '5a2c2dc85911ec398a156e49ad35c17c5534442f'
Diffstat (limited to 'packages/linux/linux-omap2_git.bb')
-rw-r--r--packages/linux/linux-omap2_git.bb11
1 files changed, 5 insertions, 6 deletions
diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index 489682e711..356d26664a 100644
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -2,10 +2,10 @@ require linux-omap.inc
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
-SRCREV = "cb170dcdce58de20b045ae964a4ccfc29aad1647"
+SRCREV = "74c89552b4a5f9b5b066f74fa265248f9b5d3f1d"
-PV = "2.6.25+2.6.26-rc1+git${SRCREV}"
-PR = "r12"
+PV = "2.6.25+2.6.26-rc2+git${SRCREV}"
+PR = "r13"
SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
@@ -13,10 +13,9 @@ SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
file://usb-timout.patch;patch=1 \
- file://l2-cache.patch;patch=1 \
- file://0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch;patch=1 \
+ file://l2-cache.patch;patch=1 \
+ file://0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch;patch=1 \
file://0001-omap3beagle-add-driver-to-turn-on-the-TFP410-framer.patch;patch=1 \
- file://l2-cache-check.patch;patch=1 \
"
COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard"