patch-2.1.34 linux/arch/sparc/kernel/ioport.c

• Lines: 26
• Date: Fri Apr 11 10:47:35 1997
• Orig file: v2.1.33/linux/arch/sparc/kernel/ioport.c
• Orig date: Sat Nov 9 00:11:39 1996

diff -u --recursive --new-file v2.1.33/linux/arch/sparc/kernel/ioport.c linux/arch/sparc/kernel/ioport.c
@@ -1,4 +1,4 @@
-/* $Id: ioport.c,v 1.22 1996/10/11 00:59:46 davem Exp $
+/* $Id: ioport.c,v 1.24 1997/04/10 03:02:32 davem Exp $
  * ioport.c:  Simple io mapping allocator.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -45,8 +45,8 @@
  *  The virtual address where the mapping actually took place.
  */
 
-void *sparc_alloc_io (void *address, void *virtual, int len, char *name,
-		      int bus_type, int rdonly)
+void *sparc_alloc_io (u32 address, void *virtual, int len, char *name,
+		      u32 bus_type, int rdonly)
 {
 	unsigned long vaddr, base_address;
 	unsigned long addr = (unsigned long) address;
@@ -110,7 +110,7 @@
  * now have to know the peculiarities of where to read the Lance data
  * from. (for example)
  */
-void *sparc_dvma_malloc (int len, char *name)
+void *_sparc_dvma_malloc (int len, char *name)
 {
 	unsigned long vaddr, base_address;