Merge branch 'linus' into oprofile-v2

[linux-2.6-omap-h63xx.git] / arch / arm / mach-mx3 / clock.c

diff --git a/arch/arm/mach-mx3/clock.c b/arch/arm/mach-mx3/clock.c
index 2f3635943e70d0c67cd850904ec483fd32818b01..9f14a871ee7c5f40c53cfd050ba7e50d7350372a 100644 (file)
--- a/arch/arm/mach-mx3/clock.c
+++ b/arch/arm/mach-mx3/clock.c
@@ -23,7 +23,7 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/io.h>
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 #include <asm/div64.h>
 
 #include "crm_regs.h"