Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/isa/Attic/isic_isa_tel_s016.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/isa/Attic/isic_isa_tel_s016.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.6
retrieving revision 1.6.4.2
diff -u -p -r1.6 -r1.6.4.2
--- src/sys/dev/isa/Attic/isic_isa_tel_s016.c	2005/02/27 00:27:17	1.6
+++ src/sys/dev/isa/Attic/isic_isa_tel_s016.c	2007/10/27 11:31:45	1.6.4.2
@@ -37,7 +37,7 @@
  *	isic - I4B Siemens ISDN Chipset Driver for Teles S0/16 and clones
  *	=================================================================
  *
- *	$Id: isic_isa_tel_s016.c,v 1.6 2005/02/27 00:27:17 perry Exp $
+ *	$Id: isic_isa_tel_s016.c,v 1.6.4.2 2007/10/27 11:31:45 yamt Exp $
  *
  *      last edit-date: [Fri Jan  5 11:37:22 2001]
  *
@@ -50,7 +50,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s016.c,v 1.6 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s016.c,v 1.6.4.2 2007/10/27 11:31:45 yamt Exp $");
 
 #include "opt_isicisa.h"
 #ifdef ISICISA_TEL_S0_16
@@ -74,7 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isa_tel
 #include <machine/md_var.h>
 #include <i386/isa/isa_device.h>
 #else
-#include <machine/bus.h>
+#include <sys/bus.h>
 #include <sys/device.h>
 #endif
 
@@ -275,7 +275,7 @@ isic_probe_s016(struct isa_device *dev)
 			return(0);
 			break;
 	}
-	sc->sc_vmem_addr = (caddr_t) dev->id_maddr;
+	sc->sc_vmem_addr = (void *) dev->id_maddr;
 	dev->id_msize = 0x1000;
 
 	/* check card signature */
@@ -325,12 +325,12 @@ isic_probe_s016(struct isa_device *dev)
 
 	/* setup ISAC base addr */
 
-	ISAC_BASE = (caddr_t) ((dev->id_maddr) + 0x100);
+	ISAC_BASE = (void *) ((dev->id_maddr) + 0x100);
 
 	/* setup HSCX base addr */
 
-	HSCX_A_BASE = (caddr_t) ((dev->id_maddr) + 0x180);
-	HSCX_B_BASE = (caddr_t) ((dev->id_maddr) + 0x1c0);
+	HSCX_A_BASE = (void *) ((dev->id_maddr) + 0x180);
+	HSCX_B_BASE = (void *) ((dev->id_maddr) + 0x1c0);
 
 	return (1);
 }