Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b650df2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e7957ec6 4b1fe779

drivers/char/vt_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -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;



	/*