patch-2.4.4 linux/include/asm-arm/io.h

• Lines: 24
• Date: Thu Apr 12 12:20:31 2001
• Orig file: v2.4.3/linux/include/asm-arm/io.h
• Orig date: Thu Feb 8 16:32:44 2001

diff -u --recursive --new-file v2.4.3/linux/include/asm-arm/io.h linux/include/asm-arm/io.h
@@ -104,11 +104,13 @@
 		_ret = __ioremap(iomem_to_phys(_off),_size,0);	\
 	_ret;							\
  })
+
+#define __arch_iounmap __iounmap
 #endif
 
 #define ioremap(off,sz)			__arch_ioremap((off),(sz),0)
 #define ioremap_nocache(off,sz)		__arch_ioremap((off),(sz),1)
-#define iounmap(_addr)			__iounmap(_addr)
+#define iounmap(_addr)			__arch_iounmap(_addr)
 
 /*
  * DMA-consistent mapping functions.  These allocate/free a region of
@@ -188,7 +190,7 @@
 	return retval;
 }
 
-#else	/* __mem_pci */
+#elif !defined(readb)
 
 #define readb(addr)			(__readwrite_bug("readb"),0)
 #define readw(addr)			(__readwrite_bug("readw"),0)