Merge current mainline tree into linux-omap tree

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

diff --git a/include/asm-arm/arch-omap/board-omap2evm.h b/arch/arm/plat-omap/include/mach/board-omap2evm.h
similarity index 96%
rename from include/asm-arm/arch-omap/board-omap2evm.h
rename to arch/arm/plat-omap/include/mach/board-omap2evm.h
index d770c5824c162804c50a42f695c1e89fd92df869..ec548d4b70504e4863281ebc219f08742b8569a4 100644 (file)
--- a/include/asm-arm/arch-omap/board-omap2evm.h
+++ b/arch/arm/plat-omap/include/mach/board-omap2evm.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-omap/board-omap2evm.h
+ * arch/arm/plat-omap/include/mach/board-omap2evm.h
  *
  * Hardware definitions for Mistral's OMAP2EVM board.
  *