diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /arch/mips/powertv/time.c | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/mips/powertv/time.c')
| -rw-r--r-- | arch/mips/powertv/time.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/powertv/time.c b/arch/mips/powertv/time.c index 1e0a5ef4c8c7..9fd7b67f2af7 100644 --- a/arch/mips/powertv/time.c +++ b/arch/mips/powertv/time.c | |||
| @@ -33,5 +33,4 @@ unsigned int __cpuinit get_c0_compare_int(void) | |||
| 33 | void __init plat_time_init(void) | 33 | void __init plat_time_init(void) |
| 34 | { | 34 | { |
| 35 | powertv_clocksource_init(); | 35 | powertv_clocksource_init(); |
| 36 | r4k_clockevent_init(); | ||
| 37 | } | 36 | } |