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/m68k/sys-available/toolchain-m68k | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/m68k') diff --git a/target/m68k/sys-available/toolchain-m68k b/target/m68k/sys-available/toolchain-m68k index b48c9b784..f7218cdbd 100644 --- a/target/m68k/sys-available/toolchain-m68k +++ b/target/m68k/sys-available/toolchain-m68k @@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_M68K bool "Toolchain only" select ADK_m68k select ADK_toolchain_m68k - select ADK_TOOLCHAIN + select ADK_TARGET_TOOLCHAIN select ADK_TARGET_PACKAGE_TXZ help Build a m68k toolchain. -- cgit v1.2.3