Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/olof/pasemi

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

diff --git a/arch/mips/kernel/irixioctl.c b/arch/mips/kernel/irixioctl.c
index e2863821a3dd8472ba194e45367a53f076552155..2bde200d5ad0b6aa13371ada255dce2355eae4ca 100644 (file)
--- a/arch/mips/kernel/irixioctl.c
+++ b/arch/mips/kernel/irixioctl.c
@@ -9,7 +9,6 @@
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
-#include <linux/smp_lock.h>
 #include <linux/sockios.h>
 #include <linux/syscalls.h>
 #include <linux/tty.h>
@@ -239,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
        }