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 5cb4f5f511bd0f7f00ef126fca55fb52ae10031f..fa0e695057db317ea3d9407ef34e9dae5e4ba878 100644 (file)
--- a/arch/arm/include/asm/mach/map.h
+++ b/arch/arm/include/asm/mach/map.h
@@ -18,17 +18,14 @@ struct map_desc {
        unsigned int type;
 };
 
-/* types 0-4 are defined in asm/io.h */
-#define MT_CACHECLEAN          5
-#define MT_MINICLEAN           6
-#define MT_LOW_VECTORS         7
-#define MT_HIGH_VECTORS                8
-#define MT_MEMORY              9
-#define MT_ROM                 10
-#define MT_MEMORY_SO           11
-
-#define MT_NONSHARED_DEVICE    MT_DEVICE_NONSHARED
-#define MT_IXP2000_DEVICE      MT_DEVICE_IXP2000
+/* types 0-3 are defined in asm/io.h */
+#define MT_CACHECLEAN          4
+#define MT_MINICLEAN           5
+#define MT_LOW_VECTORS         6
+#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);