diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
| commit | 293b05335ab540c4c8402e0a5caf2886b786a318 (patch) | |
| tree | 11e5a7c2dce338058f150e08d1ff47c9d4d8eccd /recipes/linux/linux-davinci_2.6.25.bb | |
| parent | 1ee2156592ba17f64f3c9b8970285a259730b871 (diff) | |
| parent | e9aacc4ce4784c91cb4908145b8fb7b3ec8aa6e0 (diff) | |
| download | openembedded-293b05335ab540c4c8402e0a5caf2886b786a318.tar.gz | |
Merge remote branch 'origin/org.openembedded.dev' into shr/testing2010
Conflicts:
recipes/linux/linux-openmoko-devel_git.bb
recipes/openmoko-3rdparty/pisi_0.5.2.bb
recipes/openmoko-3rdparty/pisi_0.5.3.bb
recipes/openmoko-3rdparty/pisi_0.5.bb
recipes/uclibc/uclibc_nptl.bb
Diffstat (limited to 'recipes/linux/linux-davinci_2.6.25.bb')
| -rw-r--r-- | recipes/linux/linux-davinci_2.6.25.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes/linux/linux-davinci_2.6.25.bb b/recipes/linux/linux-davinci_2.6.25.bb index ef4c919e0e..919aee3f15 100644 --- a/recipes/linux/linux-davinci_2.6.25.bb +++ b/recipes/linux/linux-davinci_2.6.25.bb @@ -8,9 +8,9 @@ PV = "2.6.25" COMPATIBLE_MACHINE = "(davinci-dvevm|davinci-sffsdr)" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git;protocol=git \ - file://8250_davinci.patch;patch=1 \ + file://8250_davinci.patch \ file://defconfig" -SRC_URI_append_davinci-sffsdr = " file://sffsdr.patch;patch=1" +SRC_URI_append_davinci-sffsdr = " file://sffsdr.patch" S = "${WORKDIR}/git" |