diff options
author | Ingo Molnar | 2008-07-31 18:43:41 +0200 |
---|---|---|
committer | Ingo Molnar | 2008-07-31 18:43:41 +0200 |
commit | 85e9ca333d03fbd56b9e123c8456f0d98e20faad (patch) | |
tree | 7bb15ada5f536950efa23ad60ea9eea60380ca1c /include/asm-arm/arch-msm/timex.h | |
parent | documentation: move hpet.txt to timers/ subdirectory (diff) | |
parent | Linux 2.6.27-rc1 (diff) | |
download | kernel-qcow2-linux-85e9ca333d03fbd56b9e123c8456f0d98e20faad.tar.gz kernel-qcow2-linux-85e9ca333d03fbd56b9e123c8456f0d98e20faad.tar.xz kernel-qcow2-linux-85e9ca333d03fbd56b9e123c8456f0d98e20faad.zip |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'include/asm-arm/arch-msm/timex.h')
-rw-r--r-- | include/asm-arm/arch-msm/timex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/arch-msm/timex.h b/include/asm-arm/arch-msm/timex.h index 154b23fb3599..8724487ab4c9 100644 --- a/include/asm-arm/arch-msm/timex.h +++ b/include/asm-arm/arch-msm/timex.h @@ -14,6 +14,7 @@ */ #ifndef __ASM_ARCH_MSM_TIMEX_H +#define __ASM_ARCH_MSM_TIMEX_H #define CLOCK_TICK_RATE 1000000 |