diff options
| author |   Paul Mackerras <paulus@samba.org> | 2005-10-31 13:37:12 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-31 13:37:12 +1100 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /arch/cris/kernel/time.c | |
| parent | ppc: remove duplicate export of cur_cpu_spec (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-serial (diff) | |
| download | linux-dev-23fd07750a789a66fe88cf173d52a18f1a387da4.tar.xz linux-dev-23fd07750a789a66fe88cf173d52a18f1a387da4.zip | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'arch/cris/kernel/time.c')
| -rw-r--r-- | arch/cris/kernel/time.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/cris/kernel/time.c b/arch/cris/kernel/time.c index a2d99b4aedcd..66ba8898db07 100644 --- a/arch/cris/kernel/time.c +++ b/arch/cris/kernel/time.c @@ -31,10 +31,7 @@ #include <linux/timex.h> #include <linux/init.h> #include <linux/profile.h> - -u64 jiffies_64 = INITIAL_JIFFIES; - -EXPORT_SYMBOL(jiffies_64); +#include <linux/sched.h> /* just for sched_clock() - funny that */ int have_rtc; /* used to remember if we have an RTC or not */; |