Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6-omap-h63xx.git] / drivers / media / video / pvrusb2 / pvrusb2-context.c

diff --git a/drivers/media/video/pvrusb2/pvrusb2-context.c b/drivers/media/video/pvrusb2/pvrusb2-context.c
index b5db6a5bab31e94b5338feb1b788ee14b129eb6e..7c19ff72e6b3255b2dbacbc32e40b028e4f76140 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-context.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-context.c
@@ -1,5 +1,4 @@
 /*
- *  $Id$
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *
@@ -195,7 +194,7 @@ static int pvr2_context_thread_func(void *foo)
 int pvr2_context_global_init(void)
 {
        pvr2_context_thread_ptr = kthread_run(pvr2_context_thread_func,
-                                             0,
+                                             NULL,
                                              "pvrusb2-context");
        return (pvr2_context_thread_ptr ? 0 : -ENOMEM);
 }