Commit f9a3780a authored by Anton Blanchard's avatar Anton Blanchard

Merge samba.org:/home/anton/ppc64/linux-2.5

into samba.org:/home/anton/ppc64/for-linus-ppc64drivers
parents 454e1bfb 6f0b2856
...@@ -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