brcm63xx: switch to 3.14

[openwrt/openwrt.git] / target / linux / brcm63xx / patches-3.10 / 061-MIPS-allow-asm-cpu.h-to-be-included-from-assembly.patch

diff --git a/target/linux/brcm63xx/patches-3.10/061-MIPS-allow-asm-cpu.h-to-be-included-from-assembly.patch b/target/linux/brcm63xx/patches-3.10/061-MIPS-allow-asm-cpu.h-to-be-included-from-assembly.patch
deleted file mode 100644 (file)
index 839cb4f..0000000
--- a/target/linux/brcm63xx/patches-3.10/061-MIPS-allow-asm-cpu.h-to-be-included-from-assembly.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 72a1c3ad0392d7b42bf50e6ecade63a775166c73 Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jogo@openwrt.org>
-Date: Thu, 27 Jun 2013 21:32:41 +0200
-Subject: [PATCH V2 02/13] 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