diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 22:31:56 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 22:31:56 +0200 |
| commit | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (patch) | |
| tree | a03891a32abe0da191fb765fe669a597e07423c6 /arch/mips/txx9/generic/setup.c | |
| parent | Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100'... (diff) | |
| parent | [ARM] Improve non-executable support (diff) | |
| download | linux-6a4690c22f5da1eb1c898b61b6a80da52fbd976f.tar.xz linux-6a4690c22f5da1eb1c898b61b6a80da52fbd976f.zip | |
Merge branch 'ptebits' into devel
Conflicts:
arch/arm/Kconfig
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 1bc57d0f4c5c..0afe94c48fb6 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(); } |