]> code.ossystems Code Review - openembedded-core.git/commitdiff
qemu: fix sloppy merge
authorJoshua Lock <josh@linux.intel.com>
Wed, 23 Jun 2010 17:01:23 +0000 (18:01 +0100)
committerJoshua Lock <josh@linux.intel.com>
Wed, 23 Jun 2010 17:01:23 +0000 (18:01 +0100)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
meta/packages/qemu/qemu_0.12.4.bb

index f1ecf3c067f46880682f3eec962c50edbd26d040..79b0749f32211945568506add513a359064c859c 100644 (file)
@@ -13,7 +13,7 @@ SRC_URI = "\
     file://fix-dirent.patch \
     file://fix-nogl.patch \
     file://qemugl-allow-glxcontext-release.patch \
-    file://linker-flags.patch"
-    file://init-info.patch;patch=1"
+    file://linker-flags.patch \
+    file://init-info.patch"
 
 S = "${WORKDIR}/qemu-${PV}"