32 lines
		
	
	
		
			721 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			32 lines
		
	
	
		
			721 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
From 520f4bf75026cc60ba47946331966fb670b39cb0 Mon Sep 17 00:00:00 2001
 | 
						|
From: Jonas Gorski <jogo@openwrt.org>
 | 
						|
Date: Thu, 27 Jun 2013 21:32:41 +0200
 | 
						|
Subject: [PATCH 02/10] 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>
 | 
						|
---
 | 
						|
 arch/mips/include/asm/cpu.h |    3 +++
 | 
						|
 1 file changed, 3 insertions(+)
 | 
						|
 | 
						|
--- a/arch/mips/include/asm/cpu.h
 | 
						|
+++ b/arch/mips/include/asm/cpu.h
 | 
						|
@@ -225,6 +225,8 @@
 | 
						|
 
 | 
						|
 #define FPIR_IMP_NONE		0x0000
 | 
						|
 
 | 
						|
+#if !defined(__ASSEMBLY__)
 | 
						|
+
 | 
						|
 enum cpu_type_enum {
 | 
						|
 	CPU_UNKNOWN,
 | 
						|
 
 | 
						|
@@ -277,6 +279,7 @@ enum cpu_type_enum {
 | 
						|
 	CPU_LAST
 | 
						|
 };
 | 
						|
 
 | 
						|
+#endif /* !__ASSEMBLY */
 | 
						|
 
 | 
						|
 /*
 | 
						|
  * ISA Level encodings
 |