summaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-26 09:57:29 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-26 09:57:29 +0000
commit84ca2520a26d5ed330fdfa8156abe6e96ae3254b (patch)
tree006fff54678eb008fbcdceb27c054d0f710e27f9 /target/linux/ar71xx
parenta71096dd1bdcc34a21601874176653f22ac0d65c (diff)
ar71xx: fix 'section type conflict' build error
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19340 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 78646210e..02f39eedb 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 78646210e..02f39eedb 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 78646210e..02f39eedb 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 */
+-