summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStephen Rothwell2006-10-06 05:54:28 +0200
committerPaul Mackerras2006-10-07 02:10:27 +0200
commit27db2d0cb9b56210dc1e29bc89a7413f3ae67b91 (patch)
tree44c4c0d7814c72902ad1b3847d8efec03232cf4d /drivers
parent[POWERPC] Update iseries_defconfig (diff)
downloadkernel-qcow2-linux-27db2d0cb9b56210dc1e29bc89a7413f3ae67b91.tar.gz
kernel-qcow2-linux-27db2d0cb9b56210dc1e29bc89a7413f3ae67b91.tar.xz
kernel-qcow2-linux-27db2d0cb9b56210dc1e29bc89a7413f3ae67b91.zip
[POWERPC] Fix viocons for irq breakage
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/viocons.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c
index a362ee9c92dd..6d2e314860df 100644
--- a/drivers/char/viocons.c
+++ b/drivers/char/viocons.c
@@ -947,7 +947,7 @@ static void vioHandleData(struct HvLpEvent *event)
*/
continue;
} else if (vio_sysrq_pressed) {
- handle_sysrq(cevent->data[index], NULL, tty);
+ handle_sysrq(cevent->data[index], tty);
vio_sysrq_pressed = 0;
/*
* continue because we don't want to add