From 45fc24024cccd400544ab2533f33a3cd421fcd77 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Sun, 5 Sep 2010 09:00:21 +0000
Subject: [PATCH] --- yaml --- r: 214330 b: refs/heads/master c:
 29af9309dba25077f711f5f975977714bc43a0c3 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/9p/trans_fd.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a3a83e8cd0fc..533c6a96653d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e04c4dc87c4af296982ff44123e064d483e826c4
+refs/heads/master: 29af9309dba25077f711f5f975977714bc43a0c3
diff --git a/trunk/net/9p/trans_fd.c b/trunk/net/9p/trans_fd.c
index c85109d809ca..078eb162d9bf 100644
--- a/trunk/net/9p/trans_fd.c
+++ b/trunk/net/9p/trans_fd.c
@@ -222,7 +222,7 @@ static void p9_conn_cancel(struct p9_conn *m, int err)
 	}
 }
 
-static unsigned int
+static int
 p9_fd_poll(struct p9_client *client, struct poll_table_struct *pt)
 {
 	int ret, n;