From a37fa3851c206044866fcd38279fb951be660557 Mon Sep 17 00:00:00 2001
From: Christoph Egger <siccegge@cs.fau.de>
Date: Wed, 9 Jun 2010 13:20:41 +0200
Subject: [PATCH] --- yaml --- r: 204529 b: refs/heads/master c:
 723b7f812fbcf76abad2c03674b3b3893ccd8516 h: refs/heads/master i:   204527:
 2f06b950787d19c685d9d964518bf1f8cca5cb93 v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/mips/cavium-octeon/serial.c    | 4 ----
 trunk/arch/mips/cavium-octeon/setup.c     | 4 ----
 trunk/arch/mips/pmc-sierra/yosemite/irq.c | 4 ----
 4 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 76714b5fadc9..d7585d55c1bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b98031e673df81989c0f4f63a99b79fa6630ff5
+refs/heads/master: 723b7f812fbcf76abad2c03674b3b3893ccd8516
diff --git a/trunk/arch/mips/cavium-octeon/serial.c b/trunk/arch/mips/cavium-octeon/serial.c
index 83eac37a1ff9..638adab02842 100644
--- a/trunk/arch/mips/cavium-octeon/serial.c
+++ b/trunk/arch/mips/cavium-octeon/serial.c
@@ -18,11 +18,7 @@
 
 #include <asm/octeon/octeon.h>
 
-#ifdef CONFIG_GDB_CONSOLE
-#define DEBUG_UART 0
-#else
 #define DEBUG_UART 1
-#endif
 
 unsigned int octeon_serial_in(struct uart_port *up, int offset)
 {
diff --git a/trunk/arch/mips/cavium-octeon/setup.c b/trunk/arch/mips/cavium-octeon/setup.c
index d1b5ffaf0281..8c81a5c5bbab 100644
--- a/trunk/arch/mips/cavium-octeon/setup.c
+++ b/trunk/arch/mips/cavium-octeon/setup.c
@@ -578,9 +578,6 @@ void __init prom_init(void)
 	}
 
 	if (strstr(arcs_cmdline, "console=") == NULL) {
-#ifdef CONFIG_GDB_CONSOLE
-		strcat(arcs_cmdline, " console=gdb");
-#else
 #ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL
 		strcat(arcs_cmdline, " console=ttyS0,115200");
 #else
@@ -588,7 +585,6 @@ void __init prom_init(void)
 			strcat(arcs_cmdline, " console=ttyS1,115200");
 		else
 			strcat(arcs_cmdline, " console=ttyS0,115200");
-#endif
 #endif
 	}
 
diff --git a/trunk/arch/mips/pmc-sierra/yosemite/irq.c b/trunk/arch/mips/pmc-sierra/yosemite/irq.c
index 51021cfd04bc..25bbbf428be9 100644
--- a/trunk/arch/mips/pmc-sierra/yosemite/irq.c
+++ b/trunk/arch/mips/pmc-sierra/yosemite/irq.c
@@ -150,8 +150,4 @@ void __init arch_init_irq(void)
 	mips_cpu_irq_init();
 	rm7k_cpu_irq_init();
 	rm9k_cpu_irq_init();
-
-#ifdef CONFIG_GDB_CONSOLE
-	register_gdb_console();
-#endif
 }