Merge current mainline tree into linux-omap tree

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

diff --git a/include/asm-arm/arch-omap/onenand.h b/arch/arm/plat-omap/include/mach/onenand.h
similarity index 100%
rename from include/asm-arm/arch-omap/onenand.h
rename to arch/arm/plat-omap/include/mach/onenand.h