aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/cavium-octeon/setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/cavium-octeon/setup.c')
-rw-r--r--arch/mips/cavium-octeon/setup.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index d1b5ffaf0281..8c81a5c5bbab 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -578,9 +578,6 @@ void __init prom_init(void)
578 } 578 }
579 579
580 if (strstr(arcs_cmdline, "console=") == NULL) { 580 if (strstr(arcs_cmdline, "console=") == NULL) {
581#ifdef CONFIG_GDB_CONSOLE
582 strcat(arcs_cmdline, " console=gdb");
583#else
584#ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL 581#ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL
585 strcat(arcs_cmdline, " console=ttyS0,115200"); 582 strcat(arcs_cmdline, " console=ttyS0,115200");
586#else 583#else
@@ -589,7 +586,6 @@ void __init prom_init(void)
589 else 586 else
590 strcat(arcs_cmdline, " console=ttyS0,115200"); 587 strcat(arcs_cmdline, " console=ttyS0,115200");
591#endif 588#endif
592#endif
593 } 589 }
594 590
595 if (octeon_is_simulation()) { 591 if (octeon_is_simulation()) {