diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 15:46:28 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 15:46:28 +0400 |
| commit | 5aa37e4f0614e3b1f385426ce1e962e84c275bdf (patch) | |
| tree | 3d8c30207989d09fde8ffb2c3c44c6b923d70062 /arch/arm/mach-davinci/io.c | |
| parent | d4c63ec060f3315653c0ae5bc3a7fe2419a2282f (diff) | |
| parent | b76d69ed721e8365739c3bd5dd7891efbea88494 (diff) | |
| download | linux-5aa37e4f0614e3b1f385426ce1e962e84c275bdf.tar.xz | |
Merge branch 'x86/core' into x86/apic
Diffstat (limited to 'arch/arm/mach-davinci/io.c')
| -rw-r--r-- | arch/arm/mach-davinci/io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/io.c b/arch/arm/mach-davinci/io.c index 47787ff84a6a..5bb66b61c1a3 100644 --- a/arch/arm/mach-davinci/io.c +++ b/arch/arm/mach-davinci/io.c @@ -17,7 +17,7 @@ #include <asm/memory.h> #include <asm/mach/map.h> -#include <asm/arch/clock.h> +#include <mach/clock.h> extern void davinci_check_revision(void); |