projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
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;