Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / include / mach / sdrc.h

diff --git a/include/asm-arm/arch-omap/sdrc.h b/arch/arm/plat-omap/include/mach/sdrc.h
similarity index 99%
rename from include/asm-arm/arch-omap/sdrc.h
rename to arch/arm/plat-omap/include/mach/sdrc.h
index 1d974a08fc3dc1da4bc808b374e1cd5f69053ea4..9cb1e2359e414837e04b772023895444d40783b9 100644 (file)
--- a/include/asm-arm/arch-omap/sdrc.h
+++ b/arch/arm/plat-omap/include/mach/sdrc.h
@@ -16,7 +16,7 @@
  * published by the Free Software Foundation.
  */
 
-#include <asm/arch/io.h>
+#include <mach/io.h>
 
 /* SDRC register offsets - read/write with sdrc_{read,write}_reg() */