From 7c98a86bbced72b1dd6e6c1f87cfd94cf08a0f88 Mon Sep 17 00:00:00 2001
From: Jason Wessel <jason.wessel@windriver.com>
Date: Fri, 10 Aug 2012 12:12:23 -0500
Subject: [PATCH] --- yaml --- r: 334164 b: refs/heads/master c:
 24b8592ec021c433e73e6d8000e71f5c341fdde0 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/tty/serial/kgdboc.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fdda55c35103..96f615423327 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42c12213141d7c88e8f649b4bacd19ba14577658
+refs/heads/master: 24b8592ec021c433e73e6d8000e71f5c341fdde0
diff --git a/trunk/drivers/tty/serial/kgdboc.c b/trunk/drivers/tty/serial/kgdboc.c
index 2b42a01a81c6..509e71456d13 100644
--- a/trunk/drivers/tty/serial/kgdboc.c
+++ b/trunk/drivers/tty/serial/kgdboc.c
@@ -97,7 +97,8 @@ static void kgdboc_restore_input(void)
 
 static int kgdboc_register_kbd(char **cptr)
 {
-	if (strncmp(*cptr, "kbd", 3) == 0) {
+	if (strncmp(*cptr, "kbd", 3) == 0 ||
+		strncmp(*cptr, "kdb", 3) == 0) {
 		if (kdb_poll_idx < KDB_POLL_FUNC_MAX) {
 			kdb_poll_funcs[kdb_poll_idx] = kdb_get_kbd_char;
 			kdb_poll_idx++;