Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6

[sfrench/cifs-2.6.git] / arch / m68k / kernel / process.c

diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c
index 632ce016014d27d6190d1776d86ecaa1503aeca6..ec37fb56c127a095ed8f5060c8af8ff6672f90d0 100644 (file)
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
@@ -233,7 +233,7 @@ asmlinkage int m68k_clone(struct pt_regs *regs)
                       parent_tidptr, child_tidptr);
 }
 
-int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
+int copy_thread(unsigned long clone_flags, unsigned long usp,
                 unsigned long unused,
                 struct task_struct * p, struct pt_regs * regs)
 {