From 2735fdf97305e110eba8e776f8728a52ae886c05 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 23 May 2014 16:39:17 +0200 Subject: resolve merge conflict --- target/arm/sys-available/qemu-arm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'target/arm/sys-available/qemu-arm') diff --git a/target/arm/sys-available/qemu-arm b/target/arm/sys-available/qemu-arm index 1fa057c4b..848179629 100644 --- a/target/arm/sys-available/qemu-arm +++ b/target/arm/sys-available/qemu-arm @@ -3,9 +3,8 @@ config ADK_TARGET_SYSTEM_QEMU_ARM select ADK_arm select ADK_qemu_arm select ADK_little - select ADK_soft_float select ADK_eabi - select ADK_HARDWARE_QEMU + select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_ZIMAGE help - Support for Qemu Emulator (arm). + Qemu Emulator for arm architecture. -- cgit v1.2.3