From: Joshua Lock <josh@linux.intel.com>
Date: Wed, 23 Jun 2010 17:01:23 +0000 (+0100)
Subject: qemu: fix sloppy merge
X-Git-Tag: 2011-1~5771
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=c9e77c18aa0c7962e00559d4122d840f90a62e79;p=openembedded-core.git

qemu: fix sloppy merge

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---

diff --git a/meta/packages/qemu/qemu_0.12.4.bb b/meta/packages/qemu/qemu_0.12.4.bb
index f1ecf3c067..79b0749f32 100644
--- a/meta/packages/qemu/qemu_0.12.4.bb
+++ b/meta/packages/qemu/qemu_0.12.4.bb
@@ -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}"