Merge current mainline tree into linux-omap tree

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

diff --git a/include/asm-arm/arch-omap/vmalloc.h b/arch/arm/plat-omap/include/mach/vmalloc.h
similarity index 94%
rename from include/asm-arm/arch-omap/vmalloc.h
rename to arch/arm/plat-omap/include/mach/vmalloc.h
index 814b22625a7749bf23c45943bc08bdfdc5766852..d8515cbdbc04f81edf13a957ea68dbc3d207e5a9 100644 (file)
--- a/include/asm-arm/arch-omap/vmalloc.h
+++ b/arch/arm/plat-omap/include/mach/vmalloc.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-omap/vmalloc.h
+ *  arch/arm/plat-omap/include/mach/vmalloc.h
  *
  *  Copyright (C) 2000 Russell King.
  *