diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-26 10:18:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-26 10:18:24 -0700 |
| commit | bd5a54e93c4d26509dca13d2f4f54d220558a012 (patch) | |
| tree | 48b826882a426e7844a0017aa998b38cc268584d /arch/mips/txx9/generic/setup.c | |
| parent | 811da237ba39d86846645379763655ddf0f7907e (diff) | |
| parent | 3e6259c3ef30432b4a067d6362738c236eb2e680 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Ignore vmlinux.lds generated files
[MIPS] kgdb: Do not call fixup_exception
[MIPS] RB532: Do not define registers that are already defined
[MIPS] IP27: Export symbol pcibus_to_node to modules.
[MIPS] kgdb: s/(void *)0)/NULL/
[MIPS] kgdb: smp_call_function's 3rd argument is a pointer.
[MIPS] TXx9: Fix mips_hpt_frequency initialization
[MIPS] emma2rh: Fix build error by header file inclusion weeding.
[MIPS] Jazz: Fix build error by header file inclusion weeding.
[MIPS] Wire up new syscalls.
[MIPS] Convert printk statements during kernel setup to use severity levels
Diffstat (limited to 'arch/mips/txx9/generic/setup.c')
| -rw-r--r-- | arch/mips/txx9/generic/setup.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c index 1bc57d0f4c5..0afe94c48fb 100644 --- a/arch/mips/txx9/generic/setup.c +++ b/arch/mips/txx9/generic/setup.c @@ -328,6 +328,9 @@ void __init arch_init_irq(void) void __init plat_time_init(void) { +#ifdef CONFIG_CPU_TX49XX + mips_hpt_frequency = txx9_cpu_clock / 2; +#endif txx9_board_vec->time_init(); } |