diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 22:38:55 +0300 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 22:38:55 +0300 |
| commit | 328198acb7407301ddf6005c0fa1e04bd0c539c8 (patch) | |
| tree | 9936112bd195bfbaacc9a75f2ea7ff757a2c0546 /arch/cris/kernel/time.c | |
| parent | 9e0cb06b17be7e562cbdaba2768649f025826dc6 (diff) | |
| parent | fecb4a0c87c2bcaee1f3cf800126eef752a07ed3 (diff) | |
| download | linux-328198acb7407301ddf6005c0fa1e04bd0c539c8.tar.xz | |
Merge branch 'master'
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 */; |