From f77b15e7516b5646c041f56969c1101a98f7e0e2 Mon Sep 17 00:00:00 2001
From: matt <matt@NetBSD.org>
Date: Thu, 10 Jan 2013 06:52:35 +0000
Subject: [PATCH] Back out workaround.

---
 common/lib/libc/arch/arm/string/strlcpy.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/lib/libc/arch/arm/string/strlcpy.S b/common/lib/libc/arch/arm/string/strlcpy.S
index c4357cc66be9..fa903d6934bb 100644
--- a/common/lib/libc/arch/arm/string/strlcpy.S
+++ b/common/lib/libc/arch/arm/string/strlcpy.S
@@ -1,8 +1,8 @@
-/* $NetBSD: strlcpy.S,v 1.3 2013/01/10 02:14:42 matt Exp $ */
+/* $NetBSD: strlcpy.S,v 1.4 2013/01/10 06:52:35 matt Exp $ */
 
 #define STRLCPY
 
-#if defined(_STANDALONE) || 1
+#if defined(_STANDALONE)
 #include "strcpy_naive.S"
 #else
 #include "strcpy_arm.S"