Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
Browse files Browse the repository at this point in the history
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
  tty: fix vt_compat_ioctl
  • Loading branch information
Linus Torvalds committed Oct 15, 2009
2 parents e7957ec + 4b1fe77 commit 2b650df
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/char/vt_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
Expand Down

0 comments on commit 2b650df

Please sign in to comment.