aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/txx9/rbtx4927
diff options
context:
space:
mode:
authorYoichi Yuasa <yuasa@linux-mips.org>2010-02-02 04:40:04 -0500
committerRalf Baechle <ralf@linux-mips.org>2010-02-27 06:53:22 -0500
commitab4ba291683d07038c7ddf1eec191d3d09e1f468 (patch)
tree267b4cefdfe33510ffe9eb8ea15de8ef71bc089d /arch/mips/txx9/rbtx4927
parent7084338eb8eb0cc021ba86c340157bad397f3f0b (diff)
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/rbtx4927')
-rw-r--r--arch/mips/txx9/rbtx4927/setup.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/mips/txx9/rbtx4927/setup.c b/arch/mips/txx9/rbtx4927/setup.c
index ee468eaee4f7..b15adfc2d726 100644
--- a/arch/mips/txx9/rbtx4927/setup.c
+++ b/arch/mips/txx9/rbtx4927/setup.c
@@ -187,8 +187,6 @@ static void __init rbtx4937_clock_init(void);
187 187
188static void __init rbtx4927_mem_setup(void) 188static void __init rbtx4927_mem_setup(void)
189{ 189{
190 char *argptr;
191
192 if (TX4927_REV_PCODE() == 0x4927) { 190 if (TX4927_REV_PCODE() == 0x4927) {
193 rbtx4927_clock_init(); 191 rbtx4927_clock_init();
194 tx4927_setup(); 192 tx4927_setup();
@@ -213,11 +211,6 @@ static void __init rbtx4927_mem_setup(void)
213 gpio_direction_output(15, 1); 211 gpio_direction_output(15, 1);
214 212
215 tx4927_sio_init(0, 0); 213 tx4927_sio_init(0, 0);
216#ifdef CONFIG_SERIAL_TXX9_CONSOLE
217 argptr = prom_getcmdline();
218 if (!strstr(argptr, "console="))
219 strcat(argptr, " console=ttyS0,38400");
220#endif
221} 214}
222 215
223static void __init rbtx4927_clock_init(void) 216static void __init rbtx4927_clock_init(void)