diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-15 18:06:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-15 18:06:02 -0400 |
| commit | 2b650df2cea96e487f2fd9ecaa68e533ea9b5ed7 (patch) | |
| tree | 6019e79893431de1109094651f57a690b6f5a0eb /drivers | |
| parent | e7957ec6b6edf7838c7d7506669ffb6e28ec481b (diff) | |
| parent | 4b1fe7797270e866adc17fc603bddf8768bc187f (diff) | |
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')
| -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, | |||
| 1532 | 1532 | ||
| 1533 | case PIO_UNIMAP: | 1533 | case PIO_UNIMAP: |
| 1534 | case GIO_UNIMAP: | 1534 | case GIO_UNIMAP: |
| 1535 | ret = do_unimap_ioctl(cmd, up, perm, vc); | 1535 | ret = compat_unimap_ioctl(cmd, up, perm, vc); |
| 1536 | break; | 1536 | break; |
| 1537 | 1537 | ||
| 1538 | /* | 1538 | /* |