Merge branch 'linus' into x86/gart

[linux-2.6-omap-h63xx.git] / arch / arm / mach-davinci / io.c

diff --git a/arch/arm/mach-davinci/io.c b/arch/arm/mach-davinci/io.c
index 47787ff84a6ad19f9fd9ab455e9cc4d1762bdbfd..5bb66b61c1a32214d7dee09102ee1cad203f9996 100644 (file)
--- 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);