Pull video into test branch

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

diff --git a/include/asm-arm/mach/map.h b/include/asm-arm/mach/map.h
index b338936bde4f4f83d9948323d155fc91d9ade1bf..cef5364ed5feb0531cc39b3bee6ccdf01426562d 100644 (file)
--- a/include/asm-arm/mach/map.h
+++ b/include/asm-arm/mach/map.h
@@ -16,8 +16,6 @@ struct map_desc {
        unsigned int type;
 };
 
-struct meminfo;
-
 #define MT_DEVICE              0
 #define MT_CACHECLEAN          1
 #define MT_MINICLEAN           2
@@ -26,11 +24,10 @@ struct meminfo;
 #define MT_MEMORY              5
 #define MT_ROM                 6
 #define MT_IXP2000_DEVICE      7
+#define MT_NONSHARED_DEVICE    8
 
-#define        __phys_to_pfn(paddr)    ((paddr) >> PAGE_SHIFT)
-#define        __pfn_to_phys(pfn)      ((pfn) << PAGE_SHIFT)
-
-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