diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-08-26 20:17:51 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-08-26 20:24:28 -0400 |
| commit | b855192c08fcb14adbc5d3a7cab182022d433cca (patch) | |
| tree | 3a10cafbfbf98cafacf667eb218c71300b351bfa /arch/arm/mach-ks8695/include/mach/timex.h | |
| parent | d886c73cd4cf02a71e1650cbcb6176799d78aac1 (diff) | |
| parent | 3e0e1e9c5a327d4dba8490d83ef55c0564e6e8a7 (diff) | |
Merge branch 'x86/urgent' into x86/pat
Reason: Change to is_new_memtype_allowed() in x86/urgent
Resolved semantic conflicts in:
arch/x86/mm/pat.c
arch/x86/mm/ioremap.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/arm/mach-ks8695/include/mach/timex.h')
| -rw-r--r-- | arch/arm/mach-ks8695/include/mach/timex.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-ks8695/include/mach/timex.h b/arch/arm/mach-ks8695/include/mach/timex.h index 4682e350369b..10f716371bd3 100644 --- a/arch/arm/mach-ks8695/include/mach/timex.h +++ b/arch/arm/mach-ks8695/include/mach/timex.h | |||
| @@ -14,7 +14,8 @@ | |||
| 14 | #ifndef __ASM_ARCH_TIMEX_H | 14 | #ifndef __ASM_ARCH_TIMEX_H |
| 15 | #define __ASM_ARCH_TIMEX_H | 15 | #define __ASM_ARCH_TIMEX_H |
| 16 | 16 | ||
| 17 | /* timers are derived from MCLK, which is 25MHz */ | 17 | #include <mach/hardware.h> |
| 18 | #define CLOCK_TICK_RATE 25000000 | 18 | |
| 19 | #define CLOCK_TICK_RATE KS8695_CLOCK_RATE | ||
| 19 | 20 | ||
| 20 | #endif | 21 | #endif |