Commit d7d823ed authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/home/davem/BK/net-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux
parents e4e08ed2 5f0a9571
...@@ -14,9 +14,12 @@ ...@@ -14,9 +14,12 @@
#include <linux/sysctl.h> #include <linux/sysctl.h>
#include <linux/config.h> #include <linux/config.h>
#ifdef CONFIG_TR
extern int sysctl_tr_rif_timeout; extern int sysctl_tr_rif_timeout;
#endif
struct ctl_table tr_table[] = { struct ctl_table tr_table[] = {
#ifdef CONFIG_TR
{ {
.ctl_name = NET_TR_RIF_TIMEOUT, .ctl_name = NET_TR_RIF_TIMEOUT,
.procname = "rif_timeout", .procname = "rif_timeout",
...@@ -25,5 +28,6 @@ struct ctl_table tr_table[] = { ...@@ -25,5 +28,6 @@ struct ctl_table tr_table[] = {
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec .proc_handler = &proc_dointvec
}, },
#endif /* CONFIG_TR */
{ 0 }, { 0 },
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment