kernel: fix bluetooth and zsmalloc for 3.14
[openwrt.git] / target / linux / brcm63xx / patches-3.13 / 008-MIPS-allow-asm-cpu.h-to-be-included-from-assembly.patch
1 From 72a1c3ad0392d7b42bf50e6ecade63a775166c73 Mon Sep 17 00:00:00 2001
2 From: Jonas Gorski <jogo@openwrt.org>
3 Date: Thu, 27 Jun 2013 21:32:41 +0200
4 Subject: [PATCH V2 02/13] MIPS: allow asm/cpu.h to be included from assembly
5
6 Add guards around the enum to allow including cpu.h from assembly.
7
8 Signed-off-by: Jonas Gorski <jogo@openwrt.org>
9 ---
10  arch/mips/include/asm/cpu.h | 3 +++
11  1 file changed, 3 insertions(+)
12
13 --- a/arch/mips/include/asm/cpu.h
14 +++ b/arch/mips/include/asm/cpu.h
15 @@ -249,6 +249,8 @@
16  
17  #define FPIR_IMP_NONE          0x0000
18  
19 +#if !defined(__ASSEMBLY__)
20 +
21  enum cpu_type_enum {
22         CPU_UNKNOWN,
23  
24 @@ -301,6 +303,7 @@ enum cpu_type_enum {
25         CPU_LAST
26  };
27  
28 +#endif /* !__ASSEMBLY */
29  
30  /*
31   * ISA Level encodings