diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-03-01 22:19:05 (GMT) |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-01 22:19:05 (GMT) |
| commit | d702d12167a2c05a346f49aac7a311d597762495 (patch) | |
| tree | baae42c299cce34d6df24b5d01f8b1d0b481bd9a /arch/mips/alchemy/mtx-1/init.c | |
| parent | 9418c65f9bd861d0f7e39aab9cfb3aa6f2275d11 (diff) | |
| parent | ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9 (diff) | |
| download | linux-fsl-qoriq-d702d12167a2c05a346f49aac7a311d597762495.tar.xz | |
Merge with mainline to remove plat-omap/Kconfig conflict
Conflicts:
arch/arm/plat-omap/Kconfig
Diffstat (limited to 'arch/mips/alchemy/mtx-1/init.c')
| -rw-r--r-- | arch/mips/alchemy/mtx-1/init.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/mips/alchemy/mtx-1/init.c b/arch/mips/alchemy/mtx-1/init.c index 5e871c8..f8d2557 100644 --- a/arch/mips/alchemy/mtx-1/init.c +++ b/arch/mips/alchemy/mtx-1/init.c @@ -32,6 +32,7 @@ #include <linux/init.h> #include <asm/bootinfo.h> +#include <asm/mach-au1x00/au1000.h> #include <prom.h> @@ -58,3 +59,8 @@ void __init prom_init(void) strict_strtoul(memsize_str, 0, &memsize); add_memory_region(0, memsize, BOOT_MEM_RAM); } + +void prom_putchar(unsigned char c) +{ + alchemy_uart_putchar(UART0_PHYS_ADDR, c); +} |