aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-04-17 09:29:29 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-04-17 09:29:29 +0000
commit27d2402d530dd9fedf9420c6d9435aed8fc2dfaa (patch)
tree41ebe058fa24b325d32caab7a2be9fd3cd618b16 /target/linux
parent05ebb23735fa9b88c4515ff2fabab78aa806a312 (diff)
downloadmaster-187ad058-27d2402d530dd9fedf9420c6d9435aed8fc2dfaa.tar.gz
master-187ad058-27d2402d530dd9fedf9420c6d9435aed8fc2dfaa.tar.bz2
master-187ad058-27d2402d530dd9fedf9420c6d9435aed8fc2dfaa.zip
kernel: refresh 2.6.32 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20952 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/023-mips-fix-kexec.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/651-swconfig-2.6.32-fix.patch2
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.32/023-mips-fix-kexec.patch b/target/linux/generic-2.6/patches-2.6.32/023-mips-fix-kexec.patch
index e51005f308..e6928dde91 100644
--- a/target/linux/generic-2.6/patches-2.6.32/023-mips-fix-kexec.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/023-mips-fix-kexec.patch
@@ -1,6 +1,6 @@
---- a/arch/mips/kernel/machine_kexec.c 2010-03-15 15:52:04.000000000 +0000
-+++ b/arch/mips/kernel/machine_kexec.c 2010-03-29 12:10:37.000000000 +0100
-@@ -52,7 +52,7 @@
+--- a/arch/mips/kernel/machine_kexec.c
++++ b/arch/mips/kernel/machine_kexec.c
+@@ -52,7 +52,7 @@ machine_kexec(struct kimage *image)
reboot_code_buffer =
(unsigned long)page_address(image->control_code_page);
diff --git a/target/linux/generic-2.6/patches-2.6.32/651-swconfig-2.6.32-fix.patch b/target/linux/generic-2.6/patches-2.6.32/651-swconfig-2.6.32-fix.patch
index bc8f8fcff9..b86e259c8d 100644
--- a/target/linux/generic-2.6/patches-2.6.32/651-swconfig-2.6.32-fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/651-swconfig-2.6.32-fix.patch
@@ -18,7 +18,7 @@
error:
if (cb.msg)
-@@ -728,7 +728,7 @@ swconfig_get_attr(struct sk_buff *skb, s
+@@ -732,7 +732,7 @@ swconfig_get_attr(struct sk_buff *skb, s
goto nla_put_failure;
swconfig_put_dev(dev);