aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-01-26 09:57:29 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-01-26 09:57:29 +0000
commit3143e747056e19248b45e4b0f918b3ea8b5b4188 (patch)
tree74f62a7ada7e141b89a580385df1f26fce5c548b /target/linux/ar71xx
parent056f25aedf6190723f1ffe1187a602e37fdc7a38 (diff)
downloadupstream-3143e747056e19248b45e4b0f918b3ea8b5b4188.tar.gz
upstream-3143e747056e19248b45e4b0f918b3ea8b5b4188.tar.bz2
upstream-3143e747056e19248b45e4b0f918b3ea8b5b4188.zip
ar71xx: fix 'section type conflict' build error
SVN-Revision: 19340
Diffstat (limited to 'target/linux/ar71xx')
-rw-r--r--target/linux/ar71xx/patches-2.6.30/400-mips-multi-machine-update.patch20
-rw-r--r--target/linux/ar71xx/patches-2.6.31/400-mips-multi-machine-update.patch20
-rw-r--r--target/linux/ar71xx/patches-2.6.32/400-mips-multi-machine-update.patch20
3 files changed, 39 insertions, 21 deletions
diff --git a/target/linux/ar71xx/patches-2.6.30/400-mips-multi-machine-update.patch b/target/linux/ar71xx/patches-2.6.30/400-mips-multi-machine-update.patch
index 78646210ec..02f39eedb3 100644
--- a/target/linux/ar71xx/patches-2.6.30/400-mips-multi-machine-update.patch
+++ b/target/linux/ar71xx/patches-2.6.30/400-mips-multi-machine-update.patch
@@ -88,7 +88,7 @@
+core_initcall(mips_machtype_init);
--- a/include/asm-mips/mips_machine.h
+++ b/include/asm-mips/mips_machine.h
-@@ -13,24 +13,32 @@
+@@ -13,25 +13,33 @@
#include <linux/init.h>
#include <linux/list.h>
@@ -113,16 +113,22 @@
-#define MIPS_MACHINE(_type, _name, _setup) \
-static char machine_name_##_type[] __initdata = _name; \
--static struct mips_machine machine_##_type __initdata = \
+#define MIPS_MACHINE(_type, _id, _name, _setup) \
-+static char machine_name_##_type[] __initconst \
++static const char machine_name_##_type[] __initconst \
+ __aligned(1) = _name; \
-+static char machine_id_##_type[] __initconst \
++static const char machine_id_##_type[] __initconst \
+ __aligned(1) = _id; \
-+static struct mips_machine machine_##_type __initconst = \
+ static struct mips_machine machine_##_type __initdata = \
{ \
.mach_type = _type, \
-+ .mach_id = machine_id_##_type, \
- .mach_name = machine_name_##_type, \
+- .mach_name = machine_name_##_type, \
++ .mach_id = (char *) machine_id_##_type, \
++ .mach_name = (char *) machine_name_##_type, \
.mach_setup = _setup, \
}; \
+ \
+@@ -44,4 +52,3 @@ static int __init register_machine_##_ty
+ pure_initcall(register_machine_##_type)
+
+ #endif /* __ASM_MIPS_MACHINE_H */
+-
diff --git a/target/linux/ar71xx/patches-2.6.31/400-mips-multi-machine-update.patch b/target/linux/ar71xx/patches-2.6.31/400-mips-multi-machine-update.patch
index 78646210ec..02f39eedb3 100644
--- a/target/linux/ar71xx/patches-2.6.31/400-mips-multi-machine-update.patch
+++ b/target/linux/ar71xx/patches-2.6.31/400-mips-multi-machine-update.patch
@@ -88,7 +88,7 @@
+core_initcall(mips_machtype_init);
--- a/include/asm-mips/mips_machine.h
+++ b/include/asm-mips/mips_machine.h
-@@ -13,24 +13,32 @@
+@@ -13,25 +13,33 @@
#include <linux/init.h>
#include <linux/list.h>
@@ -113,16 +113,22 @@
-#define MIPS_MACHINE(_type, _name, _setup) \
-static char machine_name_##_type[] __initdata = _name; \
--static struct mips_machine machine_##_type __initdata = \
+#define MIPS_MACHINE(_type, _id, _name, _setup) \
-+static char machine_name_##_type[] __initconst \
++static const char machine_name_##_type[] __initconst \
+ __aligned(1) = _name; \
-+static char machine_id_##_type[] __initconst \
++static const char machine_id_##_type[] __initconst \
+ __aligned(1) = _id; \
-+static struct mips_machine machine_##_type __initconst = \
+ static struct mips_machine machine_##_type __initdata = \
{ \
.mach_type = _type, \
-+ .mach_id = machine_id_##_type, \
- .mach_name = machine_name_##_type, \
+- .mach_name = machine_name_##_type, \
++ .mach_id = (char *) machine_id_##_type, \
++ .mach_name = (char *) machine_name_##_type, \
.mach_setup = _setup, \
}; \
+ \
+@@ -44,4 +52,3 @@ static int __init register_machine_##_ty
+ pure_initcall(register_machine_##_type)
+
+ #endif /* __ASM_MIPS_MACHINE_H */
+-
diff --git a/target/linux/ar71xx/patches-2.6.32/400-mips-multi-machine-update.patch b/target/linux/ar71xx/patches-2.6.32/400-mips-multi-machine-update.patch
index 78646210ec..02f39eedb3 100644
--- a/target/linux/ar71xx/patches-2.6.32/400-mips-multi-machine-update.patch
+++ b/target/linux/ar71xx/patches-2.6.32/400-mips-multi-machine-update.patch
@@ -88,7 +88,7 @@
+core_initcall(mips_machtype_init);
--- a/include/asm-mips/mips_machine.h
+++ b/include/asm-mips/mips_machine.h
-@@ -13,24 +13,32 @@
+@@ -13,25 +13,33 @@
#include <linux/init.h>
#include <linux/list.h>
@@ -113,16 +113,22 @@
-#define MIPS_MACHINE(_type, _name, _setup) \
-static char machine_name_##_type[] __initdata = _name; \
--static struct mips_machine machine_##_type __initdata = \
+#define MIPS_MACHINE(_type, _id, _name, _setup) \
-+static char machine_name_##_type[] __initconst \
++static const char machine_name_##_type[] __initconst \
+ __aligned(1) = _name; \
-+static char machine_id_##_type[] __initconst \
++static const char machine_id_##_type[] __initconst \
+ __aligned(1) = _id; \
-+static struct mips_machine machine_##_type __initconst = \
+ static struct mips_machine machine_##_type __initdata = \
{ \
.mach_type = _type, \
-+ .mach_id = machine_id_##_type, \
- .mach_name = machine_name_##_type, \
+- .mach_name = machine_name_##_type, \
++ .mach_id = (char *) machine_id_##_type, \
++ .mach_name = (char *) machine_name_##_type, \
.mach_setup = _setup, \
}; \
+ \
+@@ -44,4 +52,3 @@ static int __init register_machine_##_ty
+ pure_initcall(register_machine_##_type)
+
+ #endif /* __ASM_MIPS_MACHINE_H */
+-