diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-13 13:05:51 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 13:05:51 +0400 |
| commit | accba5f3965d6a9d1bf7c1e1a7995d17e9d521b6 (patch) | |
| tree | 8fb40782e79472ed882ff2098d4dd295557278ee /arch/arm/mach-msm/timer.c | |
| parent | 6852fd9b86d05063c6ef49d2e12e061cc7f6a105 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
| download | linux-accba5f3965d6a9d1bf7c1e1a7995d17e9d521b6.tar.xz | |
Merge branch 'linus' into oprofile-v2
Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/oprofile/nmi_int.c
include/linux/pci_ids.h
Diffstat (limited to 'arch/arm/mach-msm/timer.c')
| -rw-r--r-- | arch/arm/mach-msm/timer.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c index bd4732d1ab3e..2bffe9b7e9fe 100644 --- a/arch/arm/mach-msm/timer.c +++ b/arch/arm/mach-msm/timer.c @@ -20,11 +20,10 @@ #include <linux/clk.h> #include <linux/clockchips.h> #include <linux/delay.h> +#include <linux/io.h> #include <asm/mach/time.h> -#include <asm/arch/msm_iomap.h> - -#include <asm/io.h> +#include <mach/msm_iomap.h> #define MSM_DGT_BASE (MSM_GPT_BASE + 0x10) #define MSM_DGT_SHIFT (5) |