Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

[linux-2.6-omap-h63xx.git] / arch / mips / kernel / irixioctl.c

diff --git a/arch/mips/kernel/irixioctl.c b/arch/mips/kernel/irixioctl.c
index 30f9eb09db3ffe962b7aadb52df45db71eaacb1a..2bde200d5ad0b6aa13371ada255dce2355eae4ca 100644 (file)
--- a/arch/mips/kernel/irixioctl.c
+++ b/arch/mips/kernel/irixioctl.c
@@ -238,7 +238,7 @@ asmlinkage int irix_ioctl(int fd, unsigned long cmd, unsigned long arg)
                       current->comm, current->pid, cmd);
                do_exit(255);
 #else
-               error = sys_ioctl (fd, cmd, arg);
+               error = sys_ioctl(fd, cmd, arg);
 #endif
        }