diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /arch/frv/kernel/time.c | |
parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) |
Merge ../linux-2.6 by hand
Diffstat (limited to 'arch/frv/kernel/time.c')
-rw-r--r-- | arch/frv/kernel/time.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/frv/kernel/time.c b/arch/frv/kernel/time.c index 8d6558b00e44..2e9741227b73 100644 --- a/arch/frv/kernel/time.c +++ b/arch/frv/kernel/time.c | |||
@@ -34,9 +34,6 @@ | |||
34 | 34 | ||
35 | extern unsigned long wall_jiffies; | 35 | extern unsigned long wall_jiffies; |
36 | 36 | ||
37 | u64 jiffies_64 = INITIAL_JIFFIES; | ||
38 | EXPORT_SYMBOL(jiffies_64); | ||
39 | |||
40 | unsigned long __nongprelbss __clkin_clock_speed_HZ; | 37 | unsigned long __nongprelbss __clkin_clock_speed_HZ; |
41 | unsigned long __nongprelbss __ext_bus_clock_speed_HZ; | 38 | unsigned long __nongprelbss __ext_bus_clock_speed_HZ; |
42 | unsigned long __nongprelbss __res_bus_clock_speed_HZ; | 39 | unsigned long __nongprelbss __res_bus_clock_speed_HZ; |
@@ -221,6 +218,7 @@ int do_settimeofday(struct timespec *tv) | |||
221 | clock_was_set(); | 218 | clock_was_set(); |
222 | return 0; | 219 | return 0; |
223 | } | 220 | } |
221 | EXPORT_SYMBOL(do_settimeofday); | ||
224 | 222 | ||
225 | /* | 223 | /* |
226 | * Scheduler clock - returns current time in nanosec units. | 224 | * Scheduler clock - returns current time in nanosec units. |