diff --git a/[refs] b/[refs]
index c884d64b979e..405a67c55148 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42ecda1ae80b4b19c3c7ba36e3141c4c19e1fe70
+refs/heads/master: 57699407faf009f2abc33e381bc82b4c81bb0585
diff --git a/trunk/arch/mips/ar7/prom.c b/trunk/arch/mips/ar7/prom.c
index 5ad6f1db6567..453dd22ad416 100644
--- a/trunk/arch/mips/ar7/prom.c
+++ b/trunk/arch/mips/ar7/prom.c
@@ -219,14 +219,6 @@ static void __init console_config(void)
 	if (strstr(prom_getcmdline(), "console="))
 		return;
 
-#ifdef CONFIG_KGDB
-	if (!strstr(prom_getcmdline(), "nokgdb")) {
-		strcat(prom_getcmdline(), " console=kgdb");
-		kgdb_enabled = 1;
-		return;
-	}
-#endif
-
 	s = prom_getenv("modetty0");
 	if (s) {
 		baud = simple_strtoul(s, &p, 10);