Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / um / drivers / harddog_user.c

diff --git a/arch/um/drivers/harddog_user.c b/arch/um/drivers/harddog_user.c
index 5eeecf8917c3158b31a6ef960a14a7d9312f4d1b..1171790f742c33c79fe41b18fe4801947cc640d8 100644 (file)
--- a/arch/um/drivers/harddog_user.c
+++ b/arch/um/drivers/harddog_user.c
@@ -68,7 +68,7 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock)
                args = pid_args;
        }
 
-       pid = run_helper(pre_exec, &data, args, NULL);
+       pid = run_helper(pre_exec, &data, args);
 
        os_close_file(out_fds[0]);
        os_close_file(in_fds[1]);