diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 13:23:21 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 13:23:21 -0500 |
| commit | 638cbac8de9b57345a9446e107b6aebc10b58970 (patch) | |
| tree | e445fe3a1b8ad718d7ee770ed1c7a43e3eb5a611 /include/asm-arm/arch-imx/timex.h | |
| parent | f055408957750cf759162c364c2a4dfe19765844 (diff) | |
| parent | fc71fe40d2bedcc57d3406bf2050481f8b3441b6 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-arm/arch-imx/timex.h')
| -rw-r--r-- | include/asm-arm/arch-imx/timex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-imx/timex.h b/include/asm-arm/arch-imx/timex.h index d65ab3cd5d5d..8c91674706b1 100644 --- a/include/asm-arm/arch-imx/timex.h +++ b/include/asm-arm/arch-imx/timex.h | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #ifndef __ASM_ARCH_TIMEX_H | 21 | #ifndef __ASM_ARCH_TIMEX_H |
| 22 | #define __ASM_ARCH_TIMEX_H | 22 | #define __ASM_ARCH_TIMEX_H |
| 23 | 23 | ||
| 24 | #include <asm/arch/hardware.h> | 24 | #include <asm/hardware.h> |
| 25 | #define CLOCK_TICK_RATE (CLK32) | 25 | #define CLOCK_TICK_RATE (CLK32) |
| 26 | 26 | ||
| 27 | #endif | 27 | #endif |