Merge current mainline tree into linux-omap tree

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

diff --git a/include/asm-arm/arch-omap/board-omap3beagle.h b/arch/arm/plat-omap/include/mach/board-omap3beagle.h
similarity index 96%
rename from include/asm-arm/arch-omap/board-omap3beagle.h
rename to arch/arm/plat-omap/include/mach/board-omap3beagle.h
index 46dff31032e1611cfc72092c0a6d3ddc162429e5..3080d52d877a3997a194580477c32dcdf84d821b 100644 (file)
--- a/include/asm-arm/arch-omap/board-omap3beagle.h
+++ b/arch/arm/plat-omap/include/mach/board-omap3beagle.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-omap/board-omap3beagle.h
+ * arch/arm/plat-omap/include/mach/board-omap3beagle.h
  *
  * Hardware definitions for TI OMAP3 BEAGLE.
  *