X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-arm%2Fmach%2Fmap.h;h=cef5364ed5feb0531cc39b3bee6ccdf01426562d;hb=16c70f8c1b54b61c3b951b6fb220df250fe09b32;hp=284df8bb76d1845817fa7ac08e3d4df6692b239e;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/include/asm-arm/mach/map.h b/include/asm-arm/mach/map.h
index 284df8bb7..cef5364ed 100644
--- a/include/asm-arm/mach/map.h
+++ b/include/asm-arm/mach/map.h
@@ -11,20 +11,23 @@
  */
 struct map_desc {
 	unsigned long virtual;
-	unsigned long physical;
+	unsigned long pfn;
 	unsigned long length;
 	unsigned int type;
 };
 
-struct meminfo;
+#define MT_DEVICE		0
+#define MT_CACHECLEAN		1
+#define MT_MINICLEAN		2
+#define MT_LOW_VECTORS		3
+#define MT_HIGH_VECTORS		4
+#define MT_MEMORY		5
+#define MT_ROM			6
+#define MT_IXP2000_DEVICE	7
+#define MT_NONSHARED_DEVICE	8
 
-#define MT_DEVICE	0
-#define MT_CACHECLEAN	1
-#define MT_MINICLEAN	2
-#define MT_VECTORS	3
-#define MT_MEMORY	4
-
-extern void create_memmap_holes(struct meminfo *);
-extern void memtable_init(struct meminfo *);
+#ifdef CONFIG_MMU
 extern void iotable_init(struct map_desc *, int);
-extern void setup_io_desc(void);
+#else
+#define iotable_init(map,num)	do { } while (0)
+#endif