git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6 into test
[pandora-kernel.git]
/
arch
/
mips
/
cavium-octeon
/
serial.c
diff --git
a/arch/mips/cavium-octeon/serial.c
b/arch/mips/cavium-octeon/serial.c
index
12dbf53
..
057f0ae
100644
(file)
--- a/
arch/mips/cavium-octeon/serial.c
+++ b/
arch/mips/cavium-octeon/serial.c
@@
-66,7
+66,7
@@
static void __init octeon_uart_set_common(struct plat_serial8250_port *p)
/* Make simulator output fast*/
p->uartclk = 115200 * 16;
else
- p->uartclk =
mips_hpt_frequency
;
+ p->uartclk =
octeon_get_io_clock_rate()
;
p->serial_in = octeon_serial_in;
p->serial_out = octeon_serial_out;
}