summaryrefslogtreecommitdiff
path: root/drivers/s390/char/keyboard.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-09-04 00:38:52 +0400
committerTakashi Iwai <tiwai@suse.de>2010-09-04 00:38:52 +0400
commit68885a3ff38ed51fa02f241feb405c9922a90ee0 (patch)
tree2fc626df39d5e0e1f6b065238141f7d49187c737 /drivers/s390/char/keyboard.c
parent7b28079b3284ccb15ad4f003fb7073890600d0c1 (diff)
parenta2acad8298a42b7be684a32fafaf83332bba9c2b (diff)
downloadlinux-68885a3ff38ed51fa02f241feb405c9922a90ee0.tar.xz
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'drivers/s390/char/keyboard.c')
-rw-r--r--drivers/s390/char/keyboard.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c
index 18d9a497863b..8cd58e412b5e 100644
--- a/drivers/s390/char/keyboard.c
+++ b/drivers/s390/char/keyboard.c
@@ -305,7 +305,7 @@ kbd_keycode(struct kbd_data *kbd, unsigned int keycode)
if (kbd->sysrq) {
if (kbd->sysrq == K(KT_LATIN, '-')) {
kbd->sysrq = 0;
- handle_sysrq(value, kbd->tty);
+ handle_sysrq(value);
return;
}
if (value == '-') {