From 2735fdf97305e110eba8e776f8728a52ae886c05 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 23 May 2014 16:39:17 +0200
Subject: resolve merge conflict

---
 target/x86/sys-available/qemu-x86 | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 target/x86/sys-available/qemu-x86

(limited to 'target/x86/sys-available/qemu-x86')

diff --git a/target/x86/sys-available/qemu-x86 b/target/x86/sys-available/qemu-x86
new file mode 100644
index 000000000..48a71aa1d
--- /dev/null
+++ b/target/x86/sys-available/qemu-x86
@@ -0,0 +1,9 @@
+config ADK_TARGET_SYSTEM_QEMU_X86
+	bool "Qemu Emulator"
+	select ADK_x86
+	select ADK_qemu_x86
+	select ADK_TARGET_QEMU
+	select ADK_TARGET_KERNEL_BZIMAGE
+	help
+	 Support for Qemu Emulator X86 architecture.
+
-- 
cgit v1.2.3