Merge current mainline tree into linux-omap tree

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

diff --git a/include/asm-arm/arch-omap/board-nokia.h b/arch/arm/plat-omap/include/mach/board-nokia.h
similarity index 96%
rename from include/asm-arm/arch-omap/board-nokia.h
rename to arch/arm/plat-omap/include/mach/board-nokia.h
index 8e26e963e7284448f0e99d159941174e865f6d7e..198d761136b5e3e4003acf1909261ca0fe5a1e9a 100644 (file)
--- a/include/asm-arm/arch-omap/board-nokia.h
+++ b/arch/arm/plat-omap/include/mach/board-nokia.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-omap/board-nokia.h
+ *  arch/arm/plat-omap/include/mach/board-nokia.h
  *
  *  Information structures for Nokia-specific board config data
  *