From d4bc4df11871e3a1c6a77731de4a7910ba66d911 Mon Sep 17 00:00:00 2001
From: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Date: Wed, 18 Nov 2009 00:40:48 -0800
Subject: [PATCH] --- yaml --- r: 174238 b: refs/heads/master c:
 0c09b2ac35ff7c5f280e5cf8142ad0822f1c93b3 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/char/keyboard.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e4b3b31c3081..d39c87f5c0c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71bb21b677e89a2b438b804231f92b779beda5d7
+refs/heads/master: 0c09b2ac35ff7c5f280e5cf8142ad0822f1c93b3
diff --git a/trunk/drivers/char/keyboard.c b/trunk/drivers/char/keyboard.c
index 737be953cc58..747683f055ed 100644
--- a/trunk/drivers/char/keyboard.c
+++ b/trunk/drivers/char/keyboard.c
@@ -1136,7 +1136,7 @@ static int emulate_raw(struct vc_data *vc, unsigned int keycode, unsigned char u
 static void kbd_rawcode(unsigned char data)
 {
 	struct vc_data *vc = vc_cons[fg_console].d;
-	kbd = kbd_table + fg_console;
+	kbd = kbd_table + vc->vc_num;
 	if (kbd->kbdmode == VC_RAW)
 		put_queue(vc, data);
 }
@@ -1157,7 +1157,7 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
 		tty->driver_data = vc;
 	}
 
-	kbd = kbd_table + fg_console;
+	kbd = kbd_table + vc->vc_num;
 
 	if (keycode == KEY_LEFTALT || keycode == KEY_RIGHTALT)
 		sysrq_alt = down ? keycode : 0;