diff options
author | Jonas Gorski <jogo@openwrt.org> | 2013-12-18 08:12:00 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2014-01-22 14:18:50 -0500 |
commit | 68248d0c86c46249336b366baf5547bac68752f0 (patch) | |
tree | d46176d388de6bfee8eb22386b845752cbab7164 /arch | |
parent | 0e983d7b90e1272cde588529453fec1ceb822e4c (diff) |
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/
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/include/asm/cpu.h | 3 |
1 files changed, 3 insertions, 0 deletions
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 @@ | |||
249 | 249 | ||
250 | #define FPIR_IMP_NONE 0x0000 | 250 | #define FPIR_IMP_NONE 0x0000 |
251 | 251 | ||
252 | #if !defined(__ASSEMBLY__) | ||
253 | |||
252 | enum cpu_type_enum { | 254 | enum cpu_type_enum { |
253 | CPU_UNKNOWN, | 255 | CPU_UNKNOWN, |
254 | 256 | ||
@@ -301,6 +303,7 @@ enum cpu_type_enum { | |||
301 | CPU_LAST | 303 | CPU_LAST |
302 | }; | 304 | }; |
303 | 305 | ||
306 | #endif /* !__ASSEMBLY */ | ||
304 | 307 | ||
305 | /* | 308 | /* |
306 | * ISA Level encodings | 309 | * ISA Level encodings |