diff options
| author | Linus Torvalds | 2009-10-16 00:06:02 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-10-16 00:06:02 +0200 |
| commit | 2b650df2cea96e487f2fd9ecaa68e533ea9b5ed7 (patch) | |
| tree | 6019e79893431de1109094651f57a690b6f5a0eb /drivers/char | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 (diff) | |
| parent | tty: fix vt_compat_ioctl (diff) | |
| download | kernel-qcow2-linux-2b650df2cea96e487f2fd9ecaa68e533ea9b5ed7.tar.gz kernel-qcow2-linux-2b650df2cea96e487f2fd9ecaa68e533ea9b5ed7.tar.xz kernel-qcow2-linux-2b650df2cea96e487f2fd9ecaa68e533ea9b5ed7.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
tty: fix vt_compat_ioctl
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/vt_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c index 6b36ee56e6fe..ed86d3bf249a 100644 --- a/drivers/char/vt_ioctl.c +++ b/drivers/char/vt_ioctl.c @@ -1532,7 +1532,7 @@ long vt_compat_ioctl(struct tty_struct *tty, struct file * file, case PIO_UNIMAP: case GIO_UNIMAP: - ret = do_unimap_ioctl(cmd, up, perm, vc); + ret = compat_unimap_ioctl(cmd, up, perm, vc); break; /* |