Merge branch 'frv' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux...

[~andy/linux] / drivers / tty / pty.c

diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index 2310cb7282ffe30baf059030ebe30bb2de6a79bc..210774726add12f9de8ef0c280360201b6791331 100644 (file)
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -333,7 +333,7 @@ free_mem_out:
        return -ENOMEM;
 }
 
-static int pty_bsd_ioctl(struct tty_struct *tty, struct file *file,
+static int pty_bsd_ioctl(struct tty_struct *tty,
                         unsigned int cmd, unsigned long arg)
 {
        switch (cmd) {
@@ -488,7 +488,7 @@ static struct ctl_table pty_root_table[] = {
 };
 
 
-static int pty_unix98_ioctl(struct tty_struct *tty, struct file *file,
+static int pty_unix98_ioctl(struct tty_struct *tty,
                            unsigned int cmd, unsigned long arg)
 {
        switch (cmd) {