diff options
author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /drivers/char/vt_ioctl.c | |
parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) |
Merge branch 'linus' into release
Diffstat (limited to 'drivers/char/vt_ioctl.c')
-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 8944ce508e2f..a2dee0eb6dad 100644 --- a/drivers/char/vt_ioctl.c +++ b/drivers/char/vt_ioctl.c | |||
@@ -366,7 +366,7 @@ do_unimap_ioctl(int cmd, struct unimapdesc __user *user_ud, int perm, struct vc_ | |||
366 | int vt_ioctl(struct tty_struct *tty, struct file * file, | 366 | int vt_ioctl(struct tty_struct *tty, struct file * file, |
367 | unsigned int cmd, unsigned long arg) | 367 | unsigned int cmd, unsigned long arg) |
368 | { | 368 | { |
369 | struct vc_data *vc = (struct vc_data *)tty->driver_data; | 369 | struct vc_data *vc = tty->driver_data; |
370 | struct console_font_op op; /* used in multiple places here */ | 370 | struct console_font_op op; /* used in multiple places here */ |
371 | struct kbd_struct * kbd; | 371 | struct kbd_struct * kbd; |
372 | unsigned int console; | 372 | unsigned int console; |