diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-01-18 12:47:37 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-18 12:47:37 +0100 |
| commit | 0c54de146ef4303ed3c5879b043894c8db637507 (patch) | |
| tree | a4ff5bf27ffd2c4b71271b42014a0040490c7271 /arch/mips/ar7/prom.c | |
| parent | Merge branch 'sh/ioremap-fixed' (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| download | linux-0c54de146ef4303ed3c5879b043894c8db637507.tar.xz linux-0c54de146ef4303ed3c5879b043894c8db637507.zip | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/mips/ar7/prom.c')
| -rw-r--r-- | arch/mips/ar7/prom.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/mips/ar7/prom.c b/arch/mips/ar7/prom.c index 5ad6f1db6567..c1fdd3682812 100644 --- a/arch/mips/ar7/prom.c +++ b/arch/mips/ar7/prom.c @@ -219,14 +219,6 @@ static void __init console_config(void) if (strstr(prom_getcmdline(), "console=")) return; -#ifdef CONFIG_KGDB - if (!strstr(prom_getcmdline(), "nokgdb")) { - strcat(prom_getcmdline(), " console=kgdb"); - kgdb_enabled = 1; - return; - } -#endif - s = prom_getenv("modetty0"); if (s) { baud = simple_strtoul(s, &p, 10); @@ -280,13 +272,6 @@ static inline void serial_out(int offset, int value) writel(value, (void *)PORT(offset)); } -char prom_getchar(void) -{ - while (!(serial_in(UART_LSR) & UART_LSR_DR)) - ; - return serial_in(UART_RX); -} - int prom_putchar(char c) { while ((serial_in(UART_LSR) & UART_LSR_TEMT) == 0) |