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/mips/sys-available/qemu-mips64 | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 target/mips/sys-available/qemu-mips64

(limited to 'target/mips/sys-available/qemu-mips64')

diff --git a/target/mips/sys-available/qemu-mips64 b/target/mips/sys-available/qemu-mips64
deleted file mode 100644
index ce9c5b0fa..000000000
--- a/target/mips/sys-available/qemu-mips64
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_MIPS64
-	bool "Qemu Emulator (mips64 big endian o32 abi)"
-	select ADK_mips
-	select ADK_big
-	select ADK_o32
-	select ADK_qemu_mips64
-	select ADK_CPU_MIPS64
-	select ADK_LINUX_64
-	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_KERNEL_VMLINUZ
-	help
-	 Qemu support for mips64 big endian architecture with o32 abi.
-
-- 
cgit v1.2.3