From 331897e33e0da742038634b3a37e28b67da6bdf6 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Fri, 18 Sep 2009 15:09:33 +0100
Subject: [PATCH] --- yaml --- r: 166146 b: refs/heads/master c:
 74109b8913277b1dbd072039d1e0a930d2834389 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/include/asm/unified.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0c8b3122ff19..d4729b8e9ac7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 200b812d0084f800bc52465e273b118ff5f8141f
+refs/heads/master: 74109b8913277b1dbd072039d1e0a930d2834389
diff --git a/trunk/arch/arm/include/asm/unified.h b/trunk/arch/arm/include/asm/unified.h
index 073e85b9b961..bc631161e9c6 100644
--- a/trunk/arch/arm/include/asm/unified.h
+++ b/trunk/arch/arm/include/asm/unified.h
@@ -35,7 +35,9 @@
 
 #define ARM(x...)
 #define THUMB(x...)	x
+#ifdef __ASSEMBLY__
 #define W(instr)	instr.w
+#endif
 #define BSYM(sym)	sym + 1
 
 #else	/* !CONFIG_THUMB2_KERNEL */
@@ -45,7 +47,9 @@
 
 #define ARM(x...)	x
 #define THUMB(x...)
+#ifdef __ASSEMBLY__
 #define W(instr)	instr
+#endif
 #define BSYM(sym)	sym
 
 #endif	/* CONFIG_THUMB2_KERNEL */