diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
| commit | ff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch) | |
| tree | 85205005c611ab774702148558321c6fb92f1ccd /include/asm-sparc/timex.h | |
| parent | 30821fee4f0cb3e6d241d9f7ddc37742212e3eb7 (diff) | |
| parent | d37e6bf68fc1eb34a4ad21d9ae8890ed37ea80e7 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'include/asm-sparc/timex.h')
| -rw-r--r-- | include/asm-sparc/timex.h | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/include/asm-sparc/timex.h b/include/asm-sparc/timex.h index 71b45c90ccae..01d9f199d452 100644 --- a/include/asm-sparc/timex.h +++ b/include/asm-sparc/timex.h | |||
| @@ -1,15 +1,8 @@ | |||
| 1 | /* | 1 | #ifndef ___ASM_SPARC_TIMEX_H |
| 2 | * linux/include/asm-sparc/timex.h | 2 | #define ___ASM_SPARC_TIMEX_H |
| 3 | * | 3 | #if defined(__sparc__) && defined(__arch64__) |
| 4 | * sparc architecture timex specifications | 4 | #include <asm-sparc/timex_64.h> |
| 5 | */ | 5 | #else |
| 6 | #ifndef _ASMsparc_TIMEX_H | 6 | #include <asm-sparc/timex_32.h> |
| 7 | #define _ASMsparc_TIMEX_H | 7 | #endif |
| 8 | |||
| 9 | #define CLOCK_TICK_RATE 1193180 /* Underlying HZ */ | ||
| 10 | |||
| 11 | /* XXX Maybe do something better at some point... -DaveM */ | ||
| 12 | typedef unsigned long cycles_t; | ||
| 13 | #define get_cycles() (0) | ||
| 14 | |||
| 15 | #endif | 8 | #endif |