Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

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

diff --git a/include/asm-arm/mach/map.h b/include/asm-arm/mach/map.h
index 284df8b..cef5364 100644 (file)
--- 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