diff options
| author | Tejun Heo <tj@kernel.org> | 2010-02-02 14:38:15 +0900 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-02-02 14:38:15 +0900 |
| commit | ab386128f20c44c458a90039ab1bdc265ac474c9 (patch) | |
| tree | 2ad188744922b1bb951fd10ff50dc04c83acce22 /arch/mips/ar7/prom.c | |
| parent | dbfc196a3cc1a2514ad0737a82f764de23bd65e6 (diff) | |
| parent | ab658321f32770b903a4426e2a6fae0392757755 (diff) | |
| download | blackbird-op-linux-ab386128f20c44c458a90039ab1bdc265ac474c9.tar.gz blackbird-op-linux-ab386128f20c44c458a90039ab1bdc265ac474c9.zip | |
Merge branch 'master' into percpu
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) |
