diff options
author | Koen Kooi <koen@openembedded.org> | 2009-07-18 09:54:32 +0200 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2009-07-18 09:54:32 +0200 |
commit | 544b12de7343f1f56785d90b5201affe22e2ba8f (patch) | |
tree | 72e2a58d6a70ee7068461e71b57991711fa3b319 /recipes/linux/linux_2.6.29+2.6.30-rc4.bb | |
parent | 75a3dc0f45c6c6f402dad71e4e8c808c644ca63e (diff) | |
parent | e969734008bf6c558618dda87c07a03a27f3e76c (diff) |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/linux/linux_2.6.29+2.6.30-rc4.bb')
-rw-r--r-- | recipes/linux/linux_2.6.29+2.6.30-rc4.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes/linux/linux_2.6.29+2.6.30-rc4.bb b/recipes/linux/linux_2.6.29+2.6.30-rc4.bb index d014298dc2..0217587661 100644 --- a/recipes/linux/linux_2.6.29+2.6.30-rc4.bb +++ b/recipes/linux/linux_2.6.29+2.6.30-rc4.bb @@ -3,7 +3,7 @@ require linux.inc KERNEL_RELEASE = "2.6.30-rc4" OLD_KERNEL_RELEASE = "2.6.29" PV = "${OLD_KERNEL_RELEASE}+${KERNEL_RELEASE}" -PR = "r4" +PR = "r5" S = "${WORKDIR}/linux-${OLD_KERNEL_RELEASE}" @@ -32,5 +32,5 @@ SRC_URI_append_afeb9260 = " \ " SRC_URI_append_tx25 = " file://linux-2.6.30-rc4-git.patch;patch=1 \ - file://linux-2.6.30-rc4-karo3.diff;patch=1" - + file://linux-2.6.30-rc4-karo3.diff;patch=1 \ + file://stk5-baseboard_c_vesa640.patch;patch=1" |