diff --git a/[refs] b/[refs]
index a7e3a1d00877..b71449eddf90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b06e6ba25a37fe1c289049d0e0300d71ae39eff
+refs/heads/master: bac37ec8300389d355d41a828b47577c1ec2e4f4
diff --git a/trunk/net/x25/af_x25.c b/trunk/net/x25/af_x25.c
index a41cc0201760..03725c051752 100644
--- a/trunk/net/x25/af_x25.c
+++ b/trunk/net/x25/af_x25.c
@@ -744,7 +744,7 @@ static int x25_connect(struct socket *sock, struct sockaddr *uaddr,
 	return rc;
 }
 
-static int x25_wait_for_data(struct sock *sk, int timeout)
+static int x25_wait_for_data(struct sock *sk, long timeout)
 {
 	DECLARE_WAITQUEUE(wait, current);
 	int rc = 0;