summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-15 15:06:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-15 15:06:02 -0700
commit2b650df2cea96e487f2fd9ecaa68e533ea9b5ed7 (patch)
tree6019e79893431de1109094651f57a690b6f5a0eb
parente7957ec6b6edf7838c7d7506669ffb6e28ec481b (diff)
parent4b1fe7797270e866adc17fc603bddf8768bc187f (diff)
downloadlinux-sh-2b650df2cea96e487f2fd9ecaa68e533ea9b5ed7.tar.gz
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
-rw-r--r--drivers/char/vt_ioctl.c2
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;
/*