aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.10/101-MIPS-allow-asm-cpu.h-to-be-included-from-assembly.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-07-20 11:30:26 +0000
committerJonas Gorski <jogo@openwrt.org>2013-07-20 11:30:26 +0000
commit7ef37c8e3e5a787f91581fa78b527d78b5e0dc1c (patch)
treebb8f025c953044895a91e4ceedd9fed84c491554 /target/linux/brcm63xx/patches-3.10/101-MIPS-allow-asm-cpu.h-to-be-included-from-assembly.patch
parent205f7248aeb39ecd018b5cd883af2512787df505 (diff)
downloadupstream-7ef37c8e3e5a787f91581fa78b527d78b5e0dc1c.tar.gz
upstream-7ef37c8e3e5a787f91581fa78b527d78b5e0dc1c.tar.bz2
upstream-7ef37c8e3e5a787f91581fa78b527d78b5e0dc1c.zip
brcm63xx: add linux 3.10 support
Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 37481
Diffstat (limited to 'target/linux/brcm63xx/patches-3.10/101-MIPS-allow-asm-cpu.h-to-be-included-from-assembly.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.10/101-MIPS-allow-asm-cpu.h-to-be-included-from-assembly.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/101-MIPS-allow-asm-cpu.h-to-be-included-from-assembly.patch b/target/linux/brcm63xx/patches-3.10/101-MIPS-allow-asm-cpu.h-to-be-included-from-assembly.patch
new file mode 100644
index 0000000000..27c3b9eea5
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.10/101-MIPS-allow-asm-cpu.h-to-be-included-from-assembly.patch
@@ -0,0 +1,31 @@
+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