diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-08 20:33:47 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-08 22:18:18 +0400 |
| commit | 097d9eb537ff4d88b74c3fe67392e27c478ca3c5 (patch) | |
| tree | 9034d676d9096857a380aab9d99e3e88fccb6bfe /arch/m68knommu/include/asm/timex.h | |
| parent | c41107c2d4fd31924533f4dbc4c3428acc2b5894 (diff) | |
| parent | aeee90dfa01844168cd7f8051d0a0f969c573067 (diff) | |
| download | linux-097d9eb537ff4d88b74c3fe67392e27c478ca3c5.tar.xz | |
Merge Linus' latest into master
Conflicts:
drivers/watchdog/at91rm9200_wdt.c
drivers/watchdog/davinci_wdt.c
drivers/watchdog/ep93xx_wdt.c
drivers/watchdog/ixp2000_wdt.c
drivers/watchdog/ixp4xx_wdt.c
drivers/watchdog/ks8695_wdt.c
drivers/watchdog/omap_wdt.c
drivers/watchdog/pnx4008_wdt.c
drivers/watchdog/sa1100_wdt.c
drivers/watchdog/wdt285.c
Diffstat (limited to 'arch/m68knommu/include/asm/timex.h')
| -rw-r--r-- | arch/m68knommu/include/asm/timex.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/m68knommu/include/asm/timex.h b/arch/m68knommu/include/asm/timex.h new file mode 100644 index 000000000000..109050f3fe91 --- /dev/null +++ b/arch/m68knommu/include/asm/timex.h @@ -0,0 +1,23 @@ +/* + * 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 |