From 472137e23297f72a1710718ff86d961e5c310720 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Thu, 22 Jan 2015 08:38:10 +0100
Subject: Fixup during rebase: Fix merge fail

---
 makefiles/toolchain_gnu-arm-eabi.mk | 2 --
 1 file changed, 2 deletions(-)

(limited to 'makefiles')

diff --git a/makefiles/toolchain_gnu-arm-eabi.mk b/makefiles/toolchain_gnu-arm-eabi.mk
index ed56aca44..d4d73fb84 100644
--- a/makefiles/toolchain_gnu-arm-eabi.mk
+++ b/makefiles/toolchain_gnu-arm-eabi.mk
@@ -95,8 +95,6 @@ ARCHINSTRUMENTATIONDEFINES_CORTEXM4  =
 ARCHINSTRUMENTATIONDEFINES_CORTEXM3  =
 endif
 
-endif
-
 # Pick the right set of flags for the architecture.
 #
 ARCHCPUFLAGS		 = $(ARCHCPUFLAGS_$(CONFIG_ARCH))
-- 
cgit v1.2.3