diff options
Diffstat (limited to 'arch/mips/txx9/rbtx4938/setup.c')
-rw-r--r-- | arch/mips/txx9/rbtx4938/setup.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/mips/txx9/rbtx4938/setup.c b/arch/mips/txx9/rbtx4938/setup.c index d66509b14284..d6e70dab3bd3 100644 --- a/arch/mips/txx9/rbtx4938/setup.c +++ b/arch/mips/txx9/rbtx4938/setup.c | |||
@@ -153,7 +153,6 @@ static void __init rbtx4938_time_init(void) | |||
153 | static void __init rbtx4938_mem_setup(void) | 153 | static void __init rbtx4938_mem_setup(void) |
154 | { | 154 | { |
155 | unsigned long long pcfg; | 155 | unsigned long long pcfg; |
156 | char *argptr; | ||
157 | 156 | ||
158 | if (txx9_master_clock == 0) | 157 | if (txx9_master_clock == 0) |
159 | txx9_master_clock = 25000000; /* 25MHz */ | 158 | txx9_master_clock = 25000000; /* 25MHz */ |
@@ -168,11 +167,6 @@ static void __init rbtx4938_mem_setup(void) | |||
168 | #endif | 167 | #endif |
169 | 168 | ||
170 | tx4938_sio_init(7372800, 0); | 169 | tx4938_sio_init(7372800, 0); |
171 | #ifdef CONFIG_SERIAL_TXX9_CONSOLE | ||
172 | argptr = prom_getcmdline(); | ||
173 | if (!strstr(argptr, "console=")) | ||
174 | strcat(argptr, " console=ttyS0,38400"); | ||
175 | #endif | ||
176 | 170 | ||
177 | #ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_PIO58_61 | 171 | #ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_PIO58_61 |
178 | pr_info("PIOSEL: disabling both ATA and NAND selection\n"); | 172 | pr_info("PIOSEL: disabling both ATA and NAND selection\n"); |