summaryrefslogtreecommitdiff
path: root/packages/linux/linux-omap2_git.bb
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-05-29 04:42:19 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-05-29 04:42:19 +0000
commitabd25c0dce4a42a778f31cb7a560d3fc25e5f083 (patch)
tree7a86be059ade5fdb9737f2bf1c54fe3e8c611723 /packages/linux/linux-omap2_git.bb
parentdb7749c30b3890990b48ef9c52b1d479d86966b0 (diff)
parent02a398b48e62e386ffdfad36af1c21cca34ae475 (diff)
merge of '318660b8f7240f5e784cdaa0a4b9048cf6216703'
and '9a7b1dbe287eb9e4b90026bdaca80bbeaeef126b'
Diffstat (limited to 'packages/linux/linux-omap2_git.bb')
-rw-r--r--packages/linux/linux-omap2_git.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index 3a80ae3319..6c920a2027 100644
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -2,9 +2,9 @@ require linux-omap.inc
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
-SRCREV = "41c13615e46ed02a1aaafcc267603be8ea5244e9"
+SRCREV = "6b403428164c53d94bd9377d84e69052563dd57d"
-PV = "2.6.25+2.6.26-rc3+git${SRCREV}"
+PV = "2.6.25+2.6.26-rc4+git${SRCREV}"
PR = "r18"
@@ -18,6 +18,7 @@ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
file://00004-omap2-mcbsp.patch;patch=1 \
file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;patch=1 \
file://mux.patch;patch=1 \
+ file://mcbsp-fix-include.patch;patch=1 \
"
COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard"