summaryrefslogtreecommitdiff
path: root/packages/linux/linux-omap2_git.bb
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-04-30 12:59:08 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-04-30 12:59:08 +0000
commit164d14ccf62269636e0179140f24e551b04f9ca0 (patch)
tree6901edd22f53c7b2d33cfebb4a761b5b71b804fa /packages/linux/linux-omap2_git.bb
parent1c27dfaed0066c9d710be48c34bd0885b32bceaf (diff)
parent6d0ef5690afbcb6a9ed3a9b65a059a8fd7828688 (diff)
merge of 'b84aeb3b3fcb9975cdaaafccc4ecbc7ca61c5312'
and 'ff99add05b70c6e96f011a1a27dd980a5380a7bf'
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"