linux-jlime-arm: fix mismerge

diff --git a/packages/linux/linux-jlime-arm_2.6.17.bb b/packages/linux/linux-jlime-arm_2.6.17.bb
index 0f67a7c..5db9de0 100644 (file)
--- 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 \