Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

[linux-2.6] / arch / um / drivers / xterm.c

diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
index 35912846ed215e23e19739d28d2152e6d0971cd2..fd817e5415435564fcf359945a7362b6ad38db23 100644 (file)
--- a/arch/um/drivers/xterm.c
+++ b/arch/um/drivers/xterm.c
@@ -132,7 +132,7 @@ static int xterm_open(int input, int output, int primary, void *d,
        }
 
        sprintf(title, data->title, data->device);
-       pid = run_helper(NULL, NULL, argv, NULL);
+       pid = run_helper(NULL, NULL, argv);
        if (pid < 0) {
                err = pid;
                printk(UM_KERN_ERR "xterm_open : run_helper failed, "