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/sparc/kernel/time.c | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'arch/sparc/kernel/time.c')
| -rw-r--r-- | arch/sparc/kernel/time.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c index 279a62627c10..24814d58f9e1 100644 --- a/arch/sparc/kernel/time.c +++ b/arch/sparc/kernel/time.c | |||
| @@ -45,10 +45,6 @@ | |||
| 45 | 45 | ||
| 46 | extern unsigned long wall_jiffies; | 46 | extern unsigned long wall_jiffies; |
| 47 | 47 | ||
| 48 | u64 jiffies_64 = INITIAL_JIFFIES; | ||
| 49 | |||
| 50 | EXPORT_SYMBOL(jiffies_64); | ||
| 51 | |||
| 52 | DEFINE_SPINLOCK(rtc_lock); | 48 | DEFINE_SPINLOCK(rtc_lock); |
| 53 | enum sparc_clock_type sp_clock_typ; | 49 | enum sparc_clock_type sp_clock_typ; |
| 54 | DEFINE_SPINLOCK(mostek_lock); | 50 | DEFINE_SPINLOCK(mostek_lock); |