Merge branches 'core/debug', 'core/futexes', 'core/locking', 'core/rcu', 'core/signal...

[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 9eb936e49cc349564f651ea973f71e6cdd273ee9..39d949b63e80bc0cb23a59b086a2bb24711493ef 100644 (file)
--- a/arch/arm/include/asm/mach/map.h
+++ b/arch/arm/include/asm/mach/map.h
@@ -18,7 +18,8 @@ struct map_desc {
        unsigned int type;
 };
 
-/* types 0-4 are defined in asm/io.h */
+/* types 0-3 are defined in asm/io.h */
+#define MT_UNCACHED            4
 #define MT_CACHECLEAN          5
 #define MT_MINICLEAN           6
 #define MT_LOW_VECTORS         7
@@ -26,9 +27,6 @@ struct map_desc {
 #define MT_MEMORY              9
 #define MT_ROM                 10
 
-#define MT_NONSHARED_DEVICE    MT_DEVICE_NONSHARED
-#define MT_IXP2000_DEVICE      MT_DEVICE_IXP2000
-
 #ifdef CONFIG_MMU
 extern void iotable_init(struct map_desc *, int);
 #else