diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2010-02-24 14:31:04 -0500 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2010-02-24 14:33:45 -0500 |
commit | 109d28152b6e9d5de64cd23e3bc08885ccb3d1ef (patch) | |
tree | b7b8863faa05254781acfb85cc41da3eef467c6b /arch/mips/powertv/time.c | |
parent | 168cf9af699e87d5a6f44b684583714ecabb8e71 (diff) | |
parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) |
Merge tag 'v2.6.33' for its firewire changes since last branch point
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
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 | } |