diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-20 12:39:18 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-20 12:39:18 +0200 |
| commit | 170465ee7f5a9a2d0ac71285507e52642e040353 (patch) | |
| tree | dbca81f04cde9e625170abbd6a72555cfbeb194e /arch/arm/plat-mxc/time.c | |
| parent | xen_alloc_ptpage: cast PFN_PHYS() argument to unsigned long (diff) | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff) | |
| download | linux-170465ee7f5a9a2d0ac71285507e52642e040353.tar.xz linux-170465ee7f5a9a2d0ac71285507e52642e040353.zip | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'arch/arm/plat-mxc/time.c')
| -rw-r--r-- | arch/arm/plat-mxc/time.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-mxc/time.c b/arch/arm/plat-mxc/time.c index 3bf86343fdf4..fd28f5194f71 100644 --- a/arch/arm/plat-mxc/time.c +++ b/arch/arm/plat-mxc/time.c @@ -26,10 +26,10 @@ #include <linux/clockchips.h> #include <linux/clk.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/mach/time.h> -#include <asm/arch/common.h> -#include <asm/arch/mxc_timer.h> +#include <mach/common.h> +#include <mach/mxc_timer.h> static struct clock_event_device clockevent_mxc; static enum clock_event_mode clockevent_mode = CLOCK_EVT_MODE_UNUSED; |