From ca108286bb6a80c7c18b1fca239df3fb1df09db9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 17 Feb 2011 12:02:51 -0800 Subject: [PATCH] --- yaml --- r: 235541 b: refs/heads/master c: 94c2273d6c1b65eaaf2a6446c7147bdf6e5ae924 h: refs/heads/master i: 235539: 5cb46821a1737f35e345cc7818f6d71d580e206b v: v3 --- [refs] | 2 +- trunk/include/linux/tty.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9c92b85f9272..dcba2f745161 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6caa76b7786891b42b66a0e61e2c2fff2c884620 +refs/heads/master: 94c2273d6c1b65eaaf2a6446c7147bdf6e5ae924 diff --git a/trunk/include/linux/tty.h b/trunk/include/linux/tty.h index 483df15146d2..ef1e0123573b 100644 --- a/trunk/include/linux/tty.h +++ b/trunk/include/linux/tty.h @@ -587,7 +587,7 @@ extern int pcxe_open(struct tty_struct *tty, struct file *filp); extern int vt_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg); -extern long vt_compat_ioctl(struct tty_struct *tty, struct file * file, +extern long vt_compat_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg); /* tty_mutex.c */