Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

[pandora-kernel.git] / net / rxrpc / krxtimod.c

diff --git a/net/rxrpc/krxtimod.c b/net/rxrpc/krxtimod.c
index 3ac81cd..3e74669 100644 (file)
--- a/net/rxrpc/krxtimod.c
+++ b/net/rxrpc/krxtimod.c
@@ -81,7 +81,7 @@ static int krxtimod(void *arg)
 
        for (;;) {
                unsigned long jif;
-               signed long timeout;
+               long timeout;
 
                /* deal with the server being asked to die */
                if (krxtimod_die) {