Merge current mainline tree into linux-omap tree

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

diff --git a/arch/arm/mach-omap2/sdrc2xxx.c b/arch/arm/mach-omap2/sdrc2xxx.c
index e98da5c4785019063bd2a8081f6633c63edd78b0..0723e59b587f95eddb4aebeceb7925504ae4e18e 100644 (file)
--- a/arch/arm/mach-omap2/sdrc2xxx.c
+++ b/arch/arm/mach-omap2/sdrc2xxx.c
@@ -24,13 +24,13 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 
-#include <asm/arch/common.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/sram.h>
+#include <mach/common.h>
+#include <mach/clock.h>
+#include <mach/sram.h>
 
 #include "prm.h"
 
-#include <asm/arch/sdrc.h>
+#include <mach/sdrc.h>
 #include "sdrc.h"
 
 /* Memory timing, DLL mode flags */