Merge branch 'devel-stable' into devel

[karo-tx-linux.git] / arch / arm / mach-imx / clock-imx25.c

diff --git a/arch/arm/mach-imx/clock-imx25.c b/arch/arm/mach-imx/clock-imx25.c
index 21ef34c501e5d7b870a6a17510a9f43557c9232c..daa0165b6772ffb691ee91a82c21474ca2170203 100644 (file)
--- a/arch/arm/mach-imx/clock-imx25.c
+++ b/arch/arm/mach-imx/clock-imx25.c
@@ -21,8 +21,7 @@
 #include <linux/list.h>
 #include <linux/clk.h>
 #include <linux/io.h>
-
-#include <asm/clkdev.h>
+#include <linux/clkdev.h>
 
 #include <mach/clock.h>
 #include <mach/hardware.h>