Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-beck.git] / net / 9p / trans_fd.c

diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
index c85109d809caa4767ef2576c1947fcd877e432b7..078eb162d9bfc4e7d6c05cd5b59c6b8920fec31e 100644 (file)
--- a/net/9p/trans_fd.c
+++ b/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;