Merge branch 'devel-stable' into devel

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

diff --git a/arch/arm/mach-pxa/clock.h b/arch/arm/mach-pxa/clock.h
index 6e949944f2ec97233dfe0c74e4fd34ff22ad928c..f9f349a21b54ee7f2d2c1b67f5079efc11b5ad65 100644 (file)
--- a/arch/arm/mach-pxa/clock.h
+++ b/arch/arm/mach-pxa/clock.h
@@ -1,5 +1,5 @@
+#include <linux/clkdev.h>
 #include <linux/sysdev.h>
-#include <asm/clkdev.h>
 
 struct clkops {
        void                    (*enable)(struct clk *);