diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
| commit | aa11d958d1a6572eda08214d7c6a735804fe48a5 (patch) | |
| tree | d025b05270ad1e010660d17eeadc6ac3c1abbd7d /arch/arm/mach-ks8695/include/mach/timex.h | |
| parent | 07f6642ee9418e962e54cbc07471cfe2e559c568 (diff) | |
| parent | 9799218ae36910af50f002a5db1802d576fffb43 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
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 |