Merge current mainline tree into linux-omap tree

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

diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 3e15681cd29b2abcb02d273062e8a0fe9b6f98f6..be5c6169f4790e8e273ca73cb78b1f2c0d98e730 100644 (file)
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -24,14 +24,14 @@
 #include <linux/bitops.h>
 #include <linux/io.h>
 
-#include <asm/arch/clock.h>
-#include <asm/arch/clockdomain.h>
-#include <asm/arch/sram.h>
-#include <asm/arch/cpu.h>
-#include <asm/arch/prcm.h>
+#include <mach/clock.h>
+#include <mach/clockdomain.h>
+#include <mach/sram.h>
+#include <mach/cpu.h>
+#include <mach/prcm.h>
 #include <asm/div64.h>
 
-#include <asm/arch/sdrc.h>
+#include <mach/sdrc.h>
 #include "sdrc.h"
 #include "clock.h"
 #include "prm.h"