Merge current mainline tree into linux-omap tree

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

diff --git a/include/asm-arm/arch-omap/serial.h b/arch/arm/plat-omap/include/mach/serial.h
similarity index 96%
rename from include/asm-arm/arch-omap/serial.h
rename to arch/arm/plat-omap/include/mach/serial.h
index b6771b4403102512b96deb38f9c4b905ea6829fb..abea6ef349dcd05ed0563a36a90cd0ebf340026e 100644 (file)
--- a/include/asm-arm/arch-omap/serial.h
+++ b/arch/arm/plat-omap/include/mach/serial.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-omap/serial.h
+ *  arch/arm/plat-omap/include/mach/serial.h
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of