diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 23:05:26 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 23:05:26 -0400 |
| commit | 8b1aaeaf54f1bcaa0bbec6bb170db367c998d27c (patch) | |
| tree | 2478e1708f5a3da261597f4aa1011d4d41c2cc84 /arch/mips/alchemy/gpr/init.c | |
| parent | bca606a646a2b1f4fa1ae2b22a0ac707505d7297 (diff) | |
| parent | 5e152b4c9e0fce6149c74406346a7ae7e7a17727 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest
Diffstat (limited to 'arch/mips/alchemy/gpr/init.c')
| -rw-r--r-- | arch/mips/alchemy/gpr/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/alchemy/gpr/init.c b/arch/mips/alchemy/gpr/init.c index f044f4c541d7..229aafae680c 100644 --- a/arch/mips/alchemy/gpr/init.c +++ b/arch/mips/alchemy/gpr/init.c | |||
| @@ -59,5 +59,5 @@ void __init prom_init(void) | |||
| 59 | 59 | ||
| 60 | void prom_putchar(unsigned char c) | 60 | void prom_putchar(unsigned char c) |
| 61 | { | 61 | { |
| 62 | alchemy_uart_putchar(UART0_PHYS_ADDR, c); | 62 | alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c); |
| 63 | } | 63 | } |