Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 204588
b: refs/heads/master
c: ea43546
h: refs/heads/master
v: v3
  • Loading branch information
David Daney authored and Ralf Baechle committed Aug 5, 2010
1 parent fdebfad commit 2e0c0a7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 22b0763a2328434ac68cca884e1b7d350ca61332
refs/heads/master: ea435464a14af37b9384e96b2f5a1f76a605b048
6 changes: 5 additions & 1 deletion trunk/arch/mips/cavium-octeon/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,10 @@ void __init plat_mem_setup(void)
"cvmx_bootmem_phy_alloc\n");
}


/*
* Emit one character to the boot UART. Exported for use by the
* watchdog timer.
*/
int prom_putchar(char c)
{
uint64_t lsrval;
Expand All @@ -701,6 +704,7 @@ int prom_putchar(char c)
cvmx_write_csr(CVMX_MIO_UARTX_THR(octeon_uart), c & 0xffull);
return 1;
}
EXPORT_SYMBOL(prom_putchar);

void prom_free_prom_memory(void)
{
Expand Down

0 comments on commit 2e0c0a7

Please sign in to comment.