diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 21:33:01 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 21:33:01 +0300 |
| commit | ac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132 (patch) | |
| tree | d498e947176f4b77938034ff6c6427f9875da721 /arch/m68knommu/include/asm/timex.h | |
| parent | 9f4863b7dc7f545bb3a01746feafdc1208e86c89 (diff) | |
| parent | 49148020bcb6910ce71417bd990a5ce7017f9bd3 (diff) | |
| download | linux-ac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132.tar.xz | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k,m68knommu: merge header files
Resolve trivial conflict in arch/m68knommu/include/asm/Kbuild
Diffstat (limited to 'arch/m68knommu/include/asm/timex.h')
| -rw-r--r-- | arch/m68knommu/include/asm/timex.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/arch/m68knommu/include/asm/timex.h b/arch/m68knommu/include/asm/timex.h deleted file mode 100644 index 109050f3fe91..000000000000 --- a/arch/m68knommu/include/asm/timex.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * linux/include/asm-m68knommu/timex.h - * - * m68knommu architecture timex specifications - */ -#ifndef _ASM_M68KNOMMU_TIMEX_H -#define _ASM_M68KNOMMU_TIMEX_H - -#ifdef CONFIG_COLDFIRE -#include <asm/coldfire.h> -#define CLOCK_TICK_RATE MCF_CLK -#else -#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */ -#endif - -typedef unsigned long cycles_t; - -static inline cycles_t get_cycles(void) -{ - return 0; -} - -#endif |