Merge current mainline tree into linux-omap tree

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

diff --git a/include/asm-arm/arch-omap/board-ldp.h b/arch/arm/plat-omap/include/mach/board-ldp.h
similarity index 96%
rename from include/asm-arm/arch-omap/board-ldp.h
rename to arch/arm/plat-omap/include/mach/board-ldp.h
index b22756136cbadf5a4fb8dda66891739cdd422209..283fa01c9b246a78b10ffaef18b143f86be33e03 100644 (file)
--- a/include/asm-arm/arch-omap/board-ldp.h
+++ b/arch/arm/plat-omap/include/mach/board-ldp.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-omap/board-ldp.h
+ * arch/arm/plat-omap/include/mach/board-ldp.h
  *
  * Hardware definitions for TI OMAP3 LDP.
  *