Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / include / asm / mach / map.h

diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
index cb1139ac19432f555b32ccc188b12f838f1ee9d4..fa0e695057db317ea3d9407ef34e9dae5e4ba878 100644 (file)
--- a/arch/arm/include/asm/mach/map.h
+++ b/arch/arm/include/asm/mach/map.h
@@ -25,6 +25,7 @@ struct map_desc {
 #define MT_HIGH_VECTORS                7
 #define MT_MEMORY              8
 #define MT_ROM                 9
+#define MT_MEMORY_SO           10
 
 #ifdef CONFIG_MMU
 extern void iotable_init(struct map_desc *, int);