Commit b55c6d42 authored by Linus Torvalds's avatar Linus Torvalds

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

into home.transmeta.com:/home/torvalds/v2.5/linux
parents a6817928 8701eb09
...@@ -204,7 +204,7 @@ static void hvc_poll(int index) ...@@ -204,7 +204,7 @@ static void hvc_poll(int index)
sysrq_pressed = 1; sysrq_pressed = 1;
continue; continue;
} else if (sysrq_pressed) { } else if (sysrq_pressed) {
handle_sysrq(buf[i], NULL, NULL, tty); handle_sysrq(buf[i], NULL, tty);
sysrq_pressed = 0; sysrq_pressed = 0;
continue; continue;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment