diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 11:19:20 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 11:19:20 +0200 |
| commit | 8067794bec1cc5de1431102cf0a6a1c7ce75cd85 (patch) | |
| tree | 2bfa0fba060d253bbd972282b29a3d60c3e7cb7f /arch/arm/plat-omap/dmtimer.c | |
| parent | 7ab6af7ab69df8c9c5fbc380004fb81187742096 (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
Merge branch 'linus' into x86/x2apic
Conflicts:
arch/x86/kernel/genapic_64.c
Manual merge:
arch/x86/kernel/genx2apic_uv_x.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/plat-omap/dmtimer.c')
| -rw-r--r-- | arch/arm/plat-omap/dmtimer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index f22506af0e67..743a4abcd85d 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c @@ -32,10 +32,10 @@ #include <linux/list.h> #include <linux/clk.h> #include <linux/delay.h> -#include <asm/hardware.h> -#include <asm/arch/dmtimer.h> +#include <mach/hardware.h> +#include <mach/dmtimer.h> #include <asm/io.h> -#include <asm/arch/irqs.h> +#include <mach/irqs.h> /* register offsets */ #define _OMAP_TIMER_ID_OFFSET 0x00 |