From: Tony Lindgren <tony@atomide.com>
Date: Fri, 21 Nov 2008 21:17:01 +0000 (-0800)
Subject: Sync arch/arm/include/asm/mach/map.h with mainline
X-Git-Tag: v2.6.28-omap1~138
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=41cc3cea4bd402941af17363b9d99e9fd2b33525;p=linux-2.6-omap-h63xx.git

Sync arch/arm/include/asm/mach/map.h with mainline

This file got out of sync with the earlier strongly ordered patch.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
index 39d949b63e8..cb1139ac194 100644
--- a/arch/arm/include/asm/mach/map.h
+++ b/arch/arm/include/asm/mach/map.h
@@ -19,13 +19,12 @@ struct map_desc {
 };
 
 /* 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
-#define MT_HIGH_VECTORS		8
-#define MT_MEMORY		9
-#define MT_ROM			10
+#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
 
 #ifdef CONFIG_MMU
 extern void iotable_init(struct map_desc *, int);