Merge branch 'devel-stable' into devel

[mv-sheeva.git] / arch / arm / mach-pxa / clock.c

diff --git a/arch/arm/mach-pxa/clock.c b/arch/arm/mach-pxa/clock.c
index 8184fe2d71c34c55c9d783645424c5073ce66d31..d5152220ce947607f072b47ae01d21419170c3b3 100644 (file)
--- a/arch/arm/mach-pxa/clock.c
+++ b/arch/arm/mach-pxa/clock.c
@@ -6,8 +6,7 @@
 #include <linux/clk.h>
 #include <linux/spinlock.h>
 #include <linux/delay.h>
-
-#include <asm/clkdev.h>
+#include <linux/clkdev.h>
 
 #include "clock.h"