diff options
| author |   Koen Kooi <koen@openembedded.org> | 2006-07-03 09:21:41 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-07-03 09:21:41 +0000 |
| commit | 0a5186fcb3682e80cb494ae758037a53da22a098 (patch) | |
| tree | 10ebb6b0ae94f734a6e972990a30c56cd359a48b /packages | |
| parent | 05b2a4e780989cc4ed9a7f41e0628cb6be89d63f (diff) | |
| download | openembedded-0a5186fcb3682e80cb494ae758037a53da22a098.tar.gz | |
linux-jlime-arm: fix mismerge
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/linux/linux-jlime-arm_2.6.17.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/linux/linux-jlime-arm_2.6.17.bb b/packages/linux/linux-jlime-arm_2.6.17.bb index 0f67a7c2be..5db9de0d6e 100644 --- a/packages/linux/linux-jlime-arm_2.6.17.bb +++ b/packages/linux/linux-jlime-arm_2.6.17.bb @@ -12,7 +12,7 @@ SRC_URI = "http://www.kernel.orgm/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \ file://Cpu-Sa1110-Jornada720.patch;patch=0 \ file://Kconfig-Arch-Jornada720.patch;patch=0 \ file://Kconfig-Keyboard-Jornada720.patch;patch=0\ - file://Kconfig-Touchscreen-Jornada720.patch;patch=0 + file://Kconfig-Touchscreen-Jornada720.patch;patch=0 \ file://Kconfig-Video-Jornada720.patch;patch=0 \ file://Mach-Sa1100-Jornada720.patch;patch=0 \ file://Makefile-Keyboard-Jornada720.patch;patch=0 \ |