---

yaml --- r: 22662 b: refs/heads/master c: bac37ec h: refs/heads/master v: v3
git-mirror · Mar 22, 2006 · 2187c8a · 2187c8a
1 parent c5b222b
commit 2187c8a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;