diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
| commit | f11cbd74c5ff3614f6390b4de67a6ffdc614c378 (patch) | |
| tree | 6a30920ade9eeaac5bf6d6263b5d09712e882eb0 /arch/sh/include/asm/timex.h | |
| parent | 429c42c9d246f5bda868495c09974312a0177328 (diff) | |
| parent | aea187c46f7d03ce985e55eb1398d0776a15b928 (diff) | |
Merge branch 'master' into for-2.6.34
Diffstat (limited to 'arch/sh/include/asm/timex.h')
| -rw-r--r-- | arch/sh/include/asm/timex.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/sh/include/asm/timex.h b/arch/sh/include/asm/timex.h index b556d49e5f2b..18bf06d9c764 100644 --- a/arch/sh/include/asm/timex.h +++ b/arch/sh/include/asm/timex.h | |||
| @@ -6,7 +6,17 @@ | |||
| 6 | #ifndef __ASM_SH_TIMEX_H | 6 | #ifndef __ASM_SH_TIMEX_H |
| 7 | #define __ASM_SH_TIMEX_H | 7 | #define __ASM_SH_TIMEX_H |
| 8 | 8 | ||
| 9 | /* | ||
| 10 | * Only parts using the legacy CPG code for their clock framework | ||
| 11 | * implementation need to define their own Pclk value. If provided, this | ||
| 12 | * can be used for accurately setting CLOCK_TICK_RATE, otherwise we | ||
| 13 | * simply fall back on the i8253 PIT value. | ||
| 14 | */ | ||
| 15 | #ifdef CONFIG_SH_PCLK_FREQ | ||
| 9 | #define CLOCK_TICK_RATE (CONFIG_SH_PCLK_FREQ / 4) /* Underlying HZ */ | 16 | #define CLOCK_TICK_RATE (CONFIG_SH_PCLK_FREQ / 4) /* Underlying HZ */ |
| 17 | #else | ||
| 18 | #define CLOCK_TICK_RATE 1193180 | ||
| 19 | #endif | ||
| 10 | 20 | ||
| 11 | #include <asm-generic/timex.h> | 21 | #include <asm-generic/timex.h> |
| 12 | 22 | ||