summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-06-23 18:01:23 +0100
committerJoshua Lock <josh@linux.intel.com>2010-06-23 18:02:45 +0100
commit5a4342cb2ecfc8a2f4a3868a5ba66c79fbe07d5e (patch)
tree4e7ffecf8c5fd29390621fedde619b7734d2b08d
parent6e4579b32be125cab74d4ad2014fda201d6531c1 (diff)
downloadpoky-5a4342cb2ecfc8a2f4a3868a5ba66c79fbe07d5e.tar.gz
poky-5a4342cb2ecfc8a2f4a3868a5ba66c79fbe07d5e.tar.bz2
poky-5a4342cb2ecfc8a2f4a3868a5ba66c79fbe07d5e.zip
qemu: fix sloppy merge
Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rw-r--r--meta/packages/qemu/qemu_0.12.4.bb4
1 files changed, 2 insertions, 2 deletions
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}"