diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-12 12:08:57 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-12 12:08:57 (GMT) |
| commit | 871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch) | |
| tree | fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /include/asm-m68k/timex.h | |
| parent | cf2592f59c0e8ed4308adbdb2e0a88655379d579 (diff) | |
| parent | b578f3fcca1e78624dfb5f358776e63711d7fda2 (diff) | |
| download | linux-871cafcc962fa1655c44b4f0e54d4c5cc14e273c.tar.xz | |
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'include/asm-m68k/timex.h')
| -rw-r--r-- | include/asm-m68k/timex.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/include/asm-m68k/timex.h b/include/asm-m68k/timex.h deleted file mode 100644 index b87f2f2..0000000 --- a/include/asm-m68k/timex.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * linux/include/asm-m68k/timex.h - * - * m68k architecture timex specifications - */ -#ifndef _ASMm68k_TIMEX_H -#define _ASMm68k_TIMEX_H - -#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */ - -typedef unsigned long cycles_t; - -static inline cycles_t get_cycles(void) -{ - return 0; -} - -#endif |