Merge http://ppc.bkbits.net/for-linus-ppc64drivers

into home.transmeta.com:/home/torvalds/v2.5/linux

Merge http://ppc.bkbits.net/for-linus-ppc64drivers
into home.transmeta.com:/home/torvalds/v2.5/linux
b55c6d42 · Linus Torvalds · a6817928 · 8701eb09 · b55c6d42
Commit b55c6d42 authored Aug 15, 2002 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/char/hvc_console.c drivers/char/hvc_console.c +1 -1

No files found.
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -204,7 +204,7 @@ static void hvc_poll(int index)
 					sysrq_pressed = 1;
 					continue;
 				} else if (sysrq_pressed) {
-					handle_sysrq(buf[i], NULL, NULL, tty);
+					handle_sysrq(buf[i], NULL, tty);
 					sysrq_pressed = 0;
 					continue;
 				}