Re: [PATCH v4 22/24] arch/openrisc/lib/memcpy.c: use correct OR1200 option

From: Jonas Bonn
Date: Fri Feb 24 2017 - 04:46:36 EST


Hi Stafford,

Squash this patch into the memcpy patch in order to prevent surprises for anyone doing a git bisection through here.

/Jonas

On 02/24/2017 05:32 AM, Stafford Horne wrote:
From: Valentin Rothberg <valentinrothberg@xxxxxxxxx>

The Kconfig option for OR12000 is OR1K_1200.

Signed-off-by: Valentin Rothberg <valentinrothberg@xxxxxxxxx>
Signed-off-by: Stafford Horne <shorne@xxxxxxxxx>
---
arch/openrisc/lib/memcpy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/openrisc/lib/memcpy.c b/arch/openrisc/lib/memcpy.c
index 4706f01..669887a 100644
--- a/arch/openrisc/lib/memcpy.c
+++ b/arch/openrisc/lib/memcpy.c
@@ -17,7 +17,7 @@
#include <linux/string.h>
-#ifdef CONFIG_OR1200
+#ifdef CONFIG_OR1K_1200
/*
* Do memcpy with word copies and loop unrolling. This gives the
* best performance on the OR1200 and MOR1KX archirectures