aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-11-07 12:45:41 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-11-07 12:45:41 +0000
commit43f444a58c321f6f1f62ea1b191783edd4b8c080 (patch)
tree6a1ae1040d2e855dc6510464447d37c88dd612a7
parentcfb90af68eb1f3dff7dbf603da2ceb10102b0174 (diff)
downloadupstream-43f444a58c321f6f1f62ea1b191783edd4b8c080.tar.gz
upstream-43f444a58c321f6f1f62ea1b191783edd4b8c080.tar.bz2
upstream-43f444a58c321f6f1f62ea1b191783edd4b8c080.zip
refresh 2.6.31 patches
SVN-Revision: 18334
-rw-r--r--target/linux/generic-2.6/patches-2.6.31/032-mips_vmlinux_lds.patch12
-rw-r--r--target/linux/generic-2.6/patches-2.6.31/082-mtd_info_move_forward_decl.patch6
2 files changed, 8 insertions, 10 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.31/032-mips_vmlinux_lds.patch b/target/linux/generic-2.6/patches-2.6.31/032-mips_vmlinux_lds.patch
index cfe2a4d6c1..2ecf89dde0 100644
--- a/target/linux/generic-2.6/patches-2.6.31/032-mips_vmlinux_lds.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/032-mips_vmlinux_lds.patch
@@ -1,6 +1,5 @@
-diff -Nru linux-2.6.31.5/arch/mips/kernel/Makefile linux-2.6.31.5.new/arch/mips/kernel/Makefile
---- linux-2.6.31.5/arch/mips/kernel/Makefile 2009-10-25 12:35:46.137368384 +0200
-+++ linux-2.6.31.5.new/arch/mips/kernel/Makefile 2009-10-25 15:24:04.713493469 +0200
+--- a/arch/mips/kernel/Makefile
++++ b/arch/mips/kernel/Makefile
@@ -2,6 +2,8 @@
# Makefile for the Linux/MIPS kernel.
#
@@ -10,10 +9,9 @@ diff -Nru linux-2.6.31.5/arch/mips/kernel/Makefile linux-2.6.31.5.new/arch/mips/
extra-y := head.o init_task.o vmlinux.lds
obj-y += cpu-probe.o branch.o entry.o genex.o irq.o process.o \
-diff -Nru linux-2.6.31.5/arch/mips/kernel/vmlinux.lds.S linux-2.6.31.5.new/arch/mips/kernel/vmlinux.lds.S
---- linux-2.6.31.5/arch/mips/kernel/vmlinux.lds.S 2009-10-23 01:57:56.000000000 +0300
-+++ linux-2.6.31.5.new/arch/mips/kernel/vmlinux.lds.S 2009-10-25 15:26:11.631618513 +0200
-@@ -10,15 +10,15 @@
+--- a/arch/mips/kernel/vmlinux.lds.S
++++ b/arch/mips/kernel/vmlinux.lds.S
+@@ -10,15 +10,15 @@ PHDRS {
note PT_NOTE FLAGS(4); /* R__ */
}
diff --git a/target/linux/generic-2.6/patches-2.6.31/082-mtd_info_move_forward_decl.patch b/target/linux/generic-2.6/patches-2.6.31/082-mtd_info_move_forward_decl.patch
index fc69082ec5..13f0a217d4 100644
--- a/target/linux/generic-2.6/patches-2.6.31/082-mtd_info_move_forward_decl.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/082-mtd_info_move_forward_decl.patch
@@ -1,5 +1,5 @@
---- a/include/linux/mtd/partitions.h 2009-10-29 11:24:29.000000000 +0100
-+++ b/include/linux/mtd/partitions.h 2009-10-29 11:26:35.000000000 +0100
+--- a/include/linux/mtd/partitions.h
++++ b/include/linux/mtd/partitions.h
@@ -33,6 +33,7 @@
* Note: writeable partitions require their size and offset be
* erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
@@ -8,7 +8,7 @@
struct mtd_partition;
struct mtd_partition {
-@@ -49,7 +50,6 @@
+@@ -49,7 +50,6 @@ struct mtd_partition {
#define MTDPART_SIZ_FULL (0)