From 6b3950ab02426ff8b15a43506be434e5a25de955 Mon Sep 17 00:00:00 2001
From: Hirokazu Takata <takata@linux-m32r.org>
Date: Sat, 2 May 2009 22:08:33 +0900
Subject: [PATCH] --- yaml --- r: 144378 b: refs/heads/master c:
 9cd67243de582c206758adff152c5fcc1b2aa069 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/m32r/include/asm/assembler.h | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d10ef9f26916..4d80ba532a28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c88b06dc7589fb0bccd617c4659066fb803cfda
+refs/heads/master: 9cd67243de582c206758adff152c5fcc1b2aa069
diff --git a/trunk/arch/m32r/include/asm/assembler.h b/trunk/arch/m32r/include/asm/assembler.h
index 26351539b5ff..728799fc70aa 100644
--- a/trunk/arch/m32r/include/asm/assembler.h
+++ b/trunk/arch/m32r/include/asm/assembler.h
@@ -9,14 +9,15 @@
  * This file contains M32R architecture specific macro definitions.
  */
 
+#include <linux/stringify.h>
+
+#undef __STR
 
-#ifndef __STR
 #ifdef __ASSEMBLY__
 #define __STR(x) x
 #else
-#define __STR(x) #x
+#define __STR(x) __stringify(x)
 #endif
-#endif /* __STR */
 
 #ifdef CONFIG_SMP
 #define M32R_LOCK	__STR(lock)