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-smdk2440_2.6.20+git.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-smdk2440_2.6.20+git.bb')
| -rw-r--r-- | recipes/linux/linux-smdk2440_2.6.20+git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes/linux/linux-smdk2440_2.6.20+git.bb b/recipes/linux/linux-smdk2440_2.6.20+git.bb index e90274bc8b..f8ec93f8cf 100644 --- a/recipes/linux/linux-smdk2440_2.6.20+git.bb +++ b/recipes/linux/linux-smdk2440_2.6.20+git.bb @@ -6,7 +6,7 @@ PR = "r1" GGSRC = "http://www.xora.org.uk/oe/patches/" SRC_URI = "git://opensource.wolfsonmicro.com/linux-2.6-asoc-ggdev;protocol=git;tag=asoc-merge-0002 \ - file://0001-Enable-cs8900A-network-device-for-smdk2440-board.patch;patch=1 \ + file://0001-Enable-cs8900A-network-device-for-smdk2440-board.patch \ file://defconfig-smdk2440" S = "${WORKDIR}/git" |