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

Next file: linux/include/asm-alpha/core_mcpcia.h
Previous file: linux/include/asm-alpha/core_irongate.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.9/linux/include/asm-alpha/core_lca.h linux/include/asm-alpha/core_lca.h
@@ -344,11 +344,18 @@
 	*(vulp)addr = b;
 }
 
-__EXTERN_INLINE unsigned long lca_ioremap(unsigned long addr)
+__EXTERN_INLINE unsigned long lca_ioremap(unsigned long addr,
+					  unsigned long size
+					  __attribute__((unused)))
 {
 	return addr + LCA_DENSE_MEM;
 }
 
+__EXTERN_INLINE void lca_iounmap(unsigned long addr)
+{
+	return;
+}
+
 __EXTERN_INLINE int lca_is_ioaddr(unsigned long addr)
 {
 	return addr >= IDENT_ADDR + 0x120000000UL;
@@ -374,7 +381,8 @@
 #define __writew(x,a)		lca_writew((x),(unsigned long)(a))
 #define __writel(x,a)		lca_writel((x),(unsigned long)(a))
 #define __writeq(x,a)		lca_writeq((x),(unsigned long)(a))
-#define __ioremap(a)		lca_ioremap((unsigned long)(a))
+#define __ioremap(a,s)		lca_ioremap((unsigned long)(a),(s))
+#define __iounmap(a)		lca_iounmap((unsigned long)(a))
 #define __is_ioaddr(a)		lca_is_ioaddr((unsigned long)(a))
 
 #define __raw_readl(a)		__readl(a)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)