diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-17 09:29:29 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-17 09:29:29 +0000 |
| commit | fa8d98132fe12547c6fa925d72ec74e97f3d051e (patch) | |
| tree | 41ebe058fa24b325d32caab7a2be9fd3cd618b16 | |
| parent | 1668e99572f3443f81e120932f2bc9cdba97bccc (diff) | |
kernel: refresh 2.6.32 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20952 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.32/023-mips-fix-kexec.patch | 6 | ||||
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.32/651-swconfig-2.6.32-fix.patch | 2 |
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 e51005f30..e6928dde9 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 bc8f8fcff..b86e259c8 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); |