Commit 8701eb09 authored by Anton Blanchard's avatar Anton Blanchard

Merge bk://ppc@ppc.bkbits.net/for-linus-ppc64drivers

into samba.org:/scratch/anton/linux-2.5_ppc64drivers
parents c2480c85 f9a3780a
...@@ -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