Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra

[~andy/linux] / drivers / char / ttyprintk.c

diff --git a/drivers/char/ttyprintk.c b/drivers/char/ttyprintk.c
index c40c1612c8a72d5a4a4e7a07fcbe953fac7fe059..a1f68af4ccf476b5e58dd3942c08337e55303d81 100644 (file)
--- a/drivers/char/ttyprintk.c
+++ b/drivers/char/ttyprintk.c
@@ -144,7 +144,7 @@ static int tpk_write_room(struct tty_struct *tty)
 /*
  * TTY operations ioctl function.
  */
-static int tpk_ioctl(struct tty_struct *tty, struct file *file,
+static int tpk_ioctl(struct tty_struct *tty,
                        unsigned int cmd, unsigned long arg)
 {
        struct ttyprintk_port *tpkp = tty->driver_data;