Merge current mainline tree into linux-omap tree

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

diff --git a/include/asm-arm/arch-omap/board-3430sdp.h b/arch/arm/plat-omap/include/mach/board-3430sdp.h
similarity index 98%
rename from include/asm-arm/arch-omap/board-3430sdp.h
rename to arch/arm/plat-omap/include/mach/board-3430sdp.h
index 60d915b3725293f82c9ca0f09edef4a90035a4bb..67d3f784f8ff9d241a66179706bcdf8ad1eef6c0 100644 (file)
--- a/include/asm-arm/arch-omap/board-3430sdp.h
+++ b/arch/arm/plat-omap/include/mach/board-3430sdp.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-omap/board-3430sdp.h
+ * arch/arm/plat-omap/include/mach/board-3430sdp.h
  *
  * Hardware definitions for TI OMAP3430 SDP board.
  *