From 0a5186fcb3682e80cb494ae758037a53da22a098 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Jul 2006 09:21:41 +0000 Subject: linux-jlime-arm: fix mismerge --- packages/linux/linux-jlime-arm_2.6.17.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 \ -- cgit v1.2.3