diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-08-13 15:08:47 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-13 15:08:47 +0400 |
commit | a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f (patch) | |
tree | 957c915298b299902aa80afa7c78e94c71b3dc25 /arch/arm/mach-msm/timer.c | |
parent | 7b27718bdb1b70166383dec91391df5534d449ee (diff) | |
parent | 30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff) | |
download | linux-a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f.tar.xz |
Merge commit 'v2.6.27-rc3' into x86/urgent
Diffstat (limited to 'arch/arm/mach-msm/timer.c')
-rw-r--r-- | arch/arm/mach-msm/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c index bd4732d1ab3e..9f02d7dca985 100644 --- a/arch/arm/mach-msm/timer.c +++ b/arch/arm/mach-msm/timer.c @@ -22,7 +22,7 @@ #include <linux/delay.h> #include <asm/mach/time.h> -#include <asm/arch/msm_iomap.h> +#include <mach/msm_iomap.h> #include <asm/io.h> |