diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-14 14:58:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-14 14:58:01 +0200 |
| commit | 51ca3c679194e7435c25b8e77b0a73c597e41ae9 (patch) | |
| tree | a681dca369607ab0f371d5246b0f75140b860a8a /arch/arm/plat-mxc/clock.c | |
| parent | b55793f7528ce1b73c25b3ac8a86a6cda2a0f9a4 (diff) | |
| parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff) | |
Merge branch 'linus' into x86/core
Conflicts:
arch/x86/kernel/genapic_64.c
include/asm-x86/kvm_host.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/plat-mxc/clock.c')
| -rw-r--r-- | arch/arm/plat-mxc/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/clock.c b/arch/arm/plat-mxc/clock.c index 1aa86fd60d7..2f862721883 100644 --- a/arch/arm/plat-mxc/clock.c +++ b/arch/arm/plat-mxc/clock.c @@ -39,7 +39,7 @@ #include <linux/string.h> #include <linux/version.h> -#include <asm/arch/clock.h> +#include <mach/clock.h> static LIST_HEAD(clocks); static DEFINE_MUTEX(clocks_mutex); |