Merge branch 'linux-2.6'

1 files changed, 6 insertions, 1 deletions

diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
index bed939f82c..a68425a5cc 100644
--- a/kernel/sysctl_check.c
+++ b/kernel/sysctl_check.c
@@ -428,7 +428,7 @@ static struct trans_ctl_table trans_net_netrom_table[] = {
         {}
 };
 
-static struct trans_ctl_table trans_net_ax25_table[] = {
+static struct trans_ctl_table trans_net_ax25_param_table[] = {
         { NET_AX25_IP_DEFAULT_MODE,     "ip_default_mode" },
         { NET_AX25_DEFAULT_MODE,        "ax25_default_mode" },
         { NET_AX25_BACKOFF_TYPE,        "backoff_type" },
@@ -446,6 +446,11 @@ static struct trans_ctl_table trans_net_ax25_table[] = {
         {}
 };
 
+static struct trans_ctl_table trans_net_ax25_table[] = {
+        { 0, NULL, trans_net_ax25_param_table },
+        {}
+};
+
 static struct trans_ctl_table trans_net_bridge_table[] = {
         { NET_BRIDGE_NF_CALL_ARPTABLES,         "bridge-nf-call-arptables" },
         { NET_BRIDGE_NF_CALL_IPTABLES,          "bridge-nf-call-iptables" },