summaryrefslogtreecommitdiffstats
path: root/arch/mips/txx9/jmr3927
diff options
context:
space:
mode:
authorYoichi Yuasa <yuasa@linux-mips.org>2010-02-02 18:40:04 +0900
committerRalf Baechle <ralf@linux-mips.org>2010-02-27 12:53:22 +0100
commitab4ba291683d07038c7ddf1eec191d3d09e1f468 (patch)
tree267b4cefdfe33510ffe9eb8ea15de8ef71bc089d /arch/mips/txx9/jmr3927
parent7084338eb8eb0cc021ba86c340157bad397f3f0b (diff)
downloadtalos-obmc-linux-ab4ba291683d07038c7ddf1eec191d3d09e1f468.tar.gz
talos-obmc-linux-ab4ba291683d07038c7ddf1eec191d3d09e1f468.zip
MIPS: TXx9: Remove forced serial console setting
It is not always used, even if it is available. Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org> Cc: linux-mips <linux-mips@linux-mips.org> Patchwork: http://patchwork.linux-mips.org/patch/933/ Acked-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/txx9/jmr3927')
-rw-r--r--arch/mips/txx9/jmr3927/setup.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/mips/txx9/jmr3927/setup.c b/arch/mips/txx9/jmr3927/setup.c
index 25e50a7be387..3206f76f300b 100644
--- a/arch/mips/txx9/jmr3927/setup.c
+++ b/arch/mips/txx9/jmr3927/setup.c
@@ -67,8 +67,6 @@ static void jmr3927_board_init(void);
static void __init jmr3927_mem_setup(void)
{
- char *argptr;
-
set_io_port_base(JMR3927_PORT_BASE + JMR3927_PCIIO);
_machine_restart = jmr3927_machine_restart;
@@ -97,11 +95,6 @@ static void __init jmr3927_mem_setup(void)
jmr3927_board_init();
tx3927_sio_init(0, 1 << 1); /* ch1: noCTS */
-#ifdef CONFIG_SERIAL_TXX9_CONSOLE
- argptr = prom_getcmdline();
- if (!strstr(argptr, "console="))
- strcat(argptr, " console=ttyS1,115200");
-#endif
}
static void __init jmr3927_pci_setup(void)
OpenPOWER on IntegriCloud