]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
MIPS: allow asm/cpu.h to be included from assembly
authorJonas Gorski <jogo@openwrt.org>
Wed, 18 Dec 2013 13:12:00 +0000 (14:12 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 22 Jan 2014 19:18:50 +0000 (20:18 +0100)
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/

arch/mips/include/asm/cpu.h

index d2035e16502a7d98cfe3e015f9855da2617308f2..e71b49156c0c6ed2f412b998f8b17dfbd2085bd0 100644 (file)
 
 #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