Merge current mainline tree into linux-omap tree

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

diff --git a/include/asm-arm/arch-omap/board-apollon.h b/arch/arm/plat-omap/include/mach/board-apollon.h
similarity index 97%
rename from include/asm-arm/arch-omap/board-apollon.h
rename to arch/arm/plat-omap/include/mach/board-apollon.h
index 3c4b7853655ab4c8167b9ef6bd823a415aa3e519..731c858cf3fe70e836a9fbead02bee5ed7bfb5fa 100644 (file)
--- a/include/asm-arm/arch-omap/board-apollon.h
+++ b/arch/arm/plat-omap/include/mach/board-apollon.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-omap/board-apollon.h
+ * arch/arm/plat-omap/include/mach/board-apollon.h
  *
  * Hardware definitions for Samsung OMAP24XX Apollon board.
  *