summaryrefslogtreecommitdiff
path: root/packages/linux/linux-omap2_git.bb
diff options
context:
space:
mode:
authorJeremy Laine <jeremy.laine@m4x.org>2008-04-30 11:00:03 +0000
committerJeremy Laine <jeremy.laine@m4x.org>2008-04-30 11:00:03 +0000
commit97a1321ef27cb993f15464c2c43e02f81543a401 (patch)
tree50b3acedc897aa82f3b6bea0cb59acd021136458 /packages/linux/linux-omap2_git.bb
parent5aa91c3c0e9313b017bbed01e4bb544d745ada23 (diff)
parentf6d356667e9986fcec01c915bdc0b9abf6512faf (diff)
merge of '09870e1a9a4da31b62af99557013fa62d824804b'
and '4bd2ffe500d3e40adbb648e5d9f65484f4cca99b'
Diffstat (limited to 'packages/linux/linux-omap2_git.bb')
-rw-r--r--packages/linux/linux-omap2_git.bb7
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index f8c50f7c55..4a3c3faf01 100644
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -2,16 +2,17 @@ require linux-omap.inc
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
-SRCREV = "b1224e0086dc0b27a5af1e7b4f59709521569060"
+SRCREV = "59586cd959b31f91f29cf96c1d3f8ff52c3c0607"
PV = "2.6.25+git${SRCREV}"
-PR = "r5"
+PR = "r6"
SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
- file://defconfig"
+ file://defconfig"
SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
+ file://usb-timout.patch;patch=1 \
"
COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard"