summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-imx/timex.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-17 08:45:42 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-17 08:45:42 -0800
commitd0fa7e9f8ebeb19db4d2aed33c35f9d16fa7f32d (patch)
tree092bf1f6cd50db2272d12ad6991ac3465f2d19ef /include/asm-arm/arch-imx/timex.h
parentfbf0e1348ec4023675123d432ce1fdfa1eef8e54 (diff)
parent5470dc656820fb67c0a2e352f0aaa48b86c19026 (diff)
downloadlinux-d0fa7e9f8ebeb19db4d2aed33c35f9d16fa7f32d.tar.bz2
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-imx/timex.h')
-rw-r--r--include/asm-arm/arch-imx/timex.h2
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 @@
#ifndef __ASM_ARCH_TIMEX_H
#define __ASM_ARCH_TIMEX_H
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
#define CLOCK_TICK_RATE (CLK32)
#endif