Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 248645
b: refs/heads/master
c: 52ea383
h: refs/heads/master
i:
  248643: d38c340
v: v3
  • Loading branch information
Jiri Slaby authored and Greg Kroah-Hartman committed Apr 19, 2011
1 parent 33cf075 commit f95db1b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6da9e95f7381fa27bc9c66c9840b11adde778618
refs/heads/master: 52ea383aba4d86d213622b2d4a94b01b4439fe11
2 changes: 0 additions & 2 deletions trunk/drivers/tty/vt/vt_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1512,7 +1512,6 @@ long vt_compat_ioctl(struct tty_struct *tty,
{
struct vc_data *vc = tty->driver_data;
struct console_font_op op; /* used in multiple places here */
struct kbd_struct *kbd;
unsigned int console;
void __user *up = (void __user *)arg;
int perm;
Expand All @@ -1535,7 +1534,6 @@ long vt_compat_ioctl(struct tty_struct *tty,
if (current->signal->tty == tty || capable(CAP_SYS_TTY_CONFIG))
perm = 1;

kbd = kbd_table + console;
switch (cmd) {
/*
* these need special handlers for incompatible data structures
Expand Down

0 comments on commit f95db1b

Please sign in to comment.