diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-10-15 13:55:44 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-10-15 13:56:02 -0400 |
| commit | 0181b61a988424b5cc44fe09e6968142359c815e (patch) | |
| tree | 2575ee900a39ffaa169ad5aeb8aa6ddee11cfbe5 /include/asm-arm/arch-pxa/timex.h | |
| parent | 92633b72d18ca4f25de1f28e436a882159491e7e (diff) | |
| parent | 87944f3361fc033b73617aa663135c6e468957a7 (diff) | |
Merge branch 'pxa' into devel
Diffstat (limited to 'include/asm-arm/arch-pxa/timex.h')
| -rw-r--r-- | include/asm-arm/arch-pxa/timex.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/arch-pxa/timex.h b/include/asm-arm/arch-pxa/timex.h index 2473bb51d0a6..8d882f0b6a16 100644 --- a/include/asm-arm/arch-pxa/timex.h +++ b/include/asm-arm/arch-pxa/timex.h | |||
| @@ -21,4 +21,6 @@ | |||
| 21 | #else | 21 | #else |
| 22 | #define CLOCK_TICK_RATE 3250000 | 22 | #define CLOCK_TICK_RATE 3250000 |
| 23 | #endif | 23 | #endif |
| 24 | #else | ||
| 25 | #define CLOCK_TICK_RATE 3250000 | ||
| 24 | #endif | 26 | #endif |