patch-2.4.10 linux/include/asm-alpha/core_mcpcia.h

• Lines: 30
• Date: Thu Sep 13 15:21:32 2001
• Orig file: v2.4.9/linux/include/asm-alpha/core_mcpcia.h
• Orig date: Fri Mar 17 13:01:38 2000

diff -u --recursive --new-file v2.4.9/linux/include/asm-alpha/core_mcpcia.h linux/include/asm-alpha/core_mcpcia.h
@@ -326,11 +326,18 @@
  *
  */
 
-__EXTERN_INLINE unsigned long mcpcia_ioremap(unsigned long addr)
+__EXTERN_INLINE unsigned long mcpcia_ioremap(unsigned long addr,
+					     unsigned long size
+					     __attribute__((unused)))
 {
 	return addr + MCPCIA_MEM_BIAS;
 }
 
+__EXTERN_INLINE void mcpcia_iounmap(unsigned long addr)
+{
+	return;
+}
+
 __EXTERN_INLINE int mcpcia_is_ioaddr(unsigned long addr)
 {
 	return addr >= MCPCIA_SPARSE(0);
@@ -452,7 +459,8 @@
 #define __writew(x,a)		mcpcia_writew((x),(unsigned long)(a))
 #define __writel(x,a)		mcpcia_writel((x),(unsigned long)(a))
 #define __writeq(x,a)		mcpcia_writeq((x),(unsigned long)(a))
-#define __ioremap(a)		mcpcia_ioremap((unsigned long)(a))
+#define __ioremap(a,s)		mcpcia_ioremap((unsigned long)(a),(s))
+#define __iounmap(a)		mcpcia_iounmap((unsigned long)(a))
 #define __is_ioaddr(a)		mcpcia_is_ioaddr((unsigned long)(a))
 
 #define __raw_readl(a)		__readl(a)