From: Jonas Gorski <jogo@openwrt.org>
Date: Wed, 18 Dec 2013 13:12:00 +0000 (+0100)
Subject: MIPS: allow asm/cpu.h to be included from assembly
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=68248d0c86c46249336b366baf5547bac68752f0;p=linux-beck.git

MIPS: allow asm/cpu.h to be included from assembly

Add guards around the enum to allow including cpu.h from assembly.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Signed-off-by: John Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6238/
---

diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index d2035e16502a..e71b49156c0c 100644
--- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@ -249,6 +249,8 @@
 
 #define FPIR_IMP_NONE		0x0000
 
+#if !defined(__ASSEMBLY__)
+
 enum cpu_type_enum {
 	CPU_UNKNOWN,
 
@@ -301,6 +303,7 @@ enum cpu_type_enum {
 	CPU_LAST
 };
 
+#endif /* !__ASSEMBLY */
 
 /*
  * ISA Level encodings