diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-17 09:57:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-17 09:57:17 -0700 |
| commit | 4dc8ab86e0724642e2f778116de64f4b832d7d94 (patch) | |
| tree | ba3e1327823ac94dc5d33cb76d8704ea0ad915d7 /include/asm-m32r/timex.h | |
| parent | b9836e08375d86834edcde45e3628e63db8b9624 (diff) | |
| parent | 78a49990269a539fc77e9a669d9e74e1dfaec657 (diff) | |
Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
m32r: move include/asm-m32r/* to arch/m32r/include/asm/
m32r: move include/asm-m32r headers to arch/m32r/include/asm
Diffstat (limited to 'include/asm-m32r/timex.h')
| -rw-r--r-- | include/asm-m32r/timex.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/include/asm-m32r/timex.h b/include/asm-m32r/timex.h deleted file mode 100644 index bb9fe4feb12..00000000000 --- a/include/asm-m32r/timex.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef _ASM_M32R_TIMEX_H -#define _ASM_M32R_TIMEX_H - -/* - * linux/include/asm-m32r/timex.h - * - * m32r architecture timex specifications - */ - -#define CLOCK_TICK_RATE (CONFIG_BUS_CLOCK / CONFIG_TIMER_DIVIDE) -#define CLOCK_TICK_FACTOR 20 /* Factor of both 1000000 and CLOCK_TICK_RATE */ - -#ifdef __KERNEL__ -/* - * Standard way to access the cycle counter. - * Currently only used on SMP. - */ - -typedef unsigned long long cycles_t; - -static __inline__ cycles_t get_cycles (void) -{ - return 0; -} -#endif /* __KERNEL__ */ - -#endif /* _ASM_M32R_TIMEX_H */ |