aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10/902-debloat_proc.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-07-22 15:31:13 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-07-22 15:31:13 +0000
commit2c55674246b6f7600f86df516360f6e91fa11082 (patch)
tree4f0d9ddb998524a799908ecc74c5ba1e063d17c2 /target/linux/generic/patches-3.10/902-debloat_proc.patch
parentfcc7d8f722c8803f1d7555fc27638c72ad6a561a (diff)
downloadmaster-187ad058-2c55674246b6f7600f86df516360f6e91fa11082.tar.gz
master-187ad058-2c55674246b6f7600f86df516360f6e91fa11082.tar.bz2
master-187ad058-2c55674246b6f7600f86df516360f6e91fa11082.zip
kernel: update 3.10 to 3.10.2
Also refresh 3.10 patches. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37502 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10/902-debloat_proc.patch')
-rw-r--r--target/linux/generic/patches-3.10/902-debloat_proc.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.10/902-debloat_proc.patch b/target/linux/generic/patches-3.10/902-debloat_proc.patch
index 9da2648355..67ea753a10 100644
--- a/target/linux/generic/patches-3.10/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.10/902-debloat_proc.patch
@@ -111,7 +111,7 @@
if (!root_irq_dir)
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
-@@ -355,6 +355,8 @@ static int __init init_timer_list_procfs
+@@ -357,6 +357,8 @@ static int __init init_timer_list_procfs
{
struct proc_dir_entry *pe;
@@ -199,7 +199,7 @@
&fib_triestat_fops))
goto out2;
-@@ -2603,17 +2605,21 @@ int __net_init fib_proc_init(struct net
+@@ -2603,17 +2605,21 @@ int __net_init fib_proc_init(struct net
return 0;
out3: