diff --git a/[refs] b/[refs]
index 90f98772946f..1ab4061fe34b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e7c001c6279f38b15fef5369496fe1043765727
+refs/heads/master: 7f18ba6248625a587559ed1206d12ccaa3ad045e
diff --git a/trunk/include/net/x25.h b/trunk/include/net/x25.h
index 0ad90ebcf86e..e47fe440d9d7 100644
--- a/trunk/include/net/x25.h
+++ b/trunk/include/net/x25.h
@@ -259,6 +259,7 @@ extern int  x25_decode(struct sock *, struct sk_buff *, int *, int *, int *, int
 extern void x25_disconnect(struct sock *, int, unsigned char, unsigned char);
 
 /* x25_timer.c */
+extern void x25_init_timers(struct sock *sk);
 extern void x25_start_heartbeat(struct sock *);
 extern void x25_start_t2timer(struct sock *);
 extern void x25_start_t21timer(struct sock *);
diff --git a/trunk/net/x25/af_x25.c b/trunk/net/x25/af_x25.c
index 52a2726d327f..b5c80b189902 100644
--- a/trunk/net/x25/af_x25.c
+++ b/trunk/net/x25/af_x25.c
@@ -484,8 +484,6 @@ static struct sock *x25_alloc_socket(void)
 	return sk;
 }
 
-void x25_init_timers(struct sock *sk);
-
 static int x25_create(struct socket *sock, int protocol)
 {
 	struct sock *sk;