Merge branch 'for-linus' of git://linux-arm.org/linux-2.6

[mv-sheeva.git] / arch / um / drivers / slirp_user.c

diff --git a/arch/um/drivers/slirp_user.c b/arch/um/drivers/slirp_user.c
index 89c1be225fda5f23525f0799673ba37fe11b6483..a0ada8fec72ab5cde45462e3a2ed0311a0561e50 100644 (file)
--- a/arch/um/drivers/slirp_user.c
+++ b/arch/um/drivers/slirp_user.c
@@ -98,7 +98,7 @@ static void slirp_close(int fd, void *data)
                       "(%d)\n", pri->pid, errno);
        }
 #endif
-       err = helper_wait(pri->pid, 1, "slirp_close");
+       err = helper_wait(pri->pid);
        if (err < 0)
                return;