diff --git a/[refs] b/[refs]
index 9165dec77aef..f3a1632cddb4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6a176228a38d74c0360ca586146bd45a2ac2d60
+refs/heads/master: e14bec2e2b59a6180f04544a867b7e52cd414455
diff --git a/trunk/net/ax25/sysctl_net_ax25.c b/trunk/net/ax25/sysctl_net_ax25.c
index c1d877bb5dff..62ee3fb34732 100644
--- a/trunk/net/ax25/sysctl_net_ax25.c
+++ b/trunk/net/ax25/sysctl_net_ax25.c
@@ -24,7 +24,9 @@ static int min_idle[1],			max_idle[] = {65535000};
 static int min_n2[] = {1},		max_n2[] = {31};
 static int min_paclen[] = {1},		max_paclen[] = {512};
 static int min_proto[1],		max_proto[] = { AX25_PROTO_MAX };
+#ifdef CONFIG_AX25_DAMA_SLAVE
 static int min_ds_timeout[1],		max_ds_timeout[] = {65535000};
+#endif
 
 static struct ctl_table_header *ax25_table_header;