3 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/mac68k/include/autoconf.h b/sys/arch/mac68k/include/autoconf.h
index c33b19860d6..ebeb4d8cd15 100644
--- a/sys/arch/mac68k/include/autoconf.h
+++ b/sys/arch/mac68k/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.8 2002/03/14 01:26:35 millert Exp $	*/
+/*	$OpenBSD: autoconf.h,v 1.9 2005/07/23 23:30:55 martin Exp $	*/
 /*	$NetBSD: autoconf.h,v 1.5 1996/12/17 06:47:40 scottr Exp $	*/
 
 /*
@@ -46,7 +46,7 @@
 void	setconf(void);
 
 /* machdep.c */
-void	mac68k_set_io_offsets(vm_offset_t);
+void	mac68k_set_io_offsets(vaddr_t);
 void	dumpconf(void);
 int	badbaddr(register caddr_t addr);
 int	badwaddr(register caddr_t addr);
diff --git a/sys/arch/mac68k/include/cpu.h b/sys/arch/mac68k/include/cpu.h
index 3c5255ac236..314d2466c5f 100644
--- a/sys/arch/mac68k/include/cpu.h
+++ b/sys/arch/mac68k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.31 2005/07/18 16:58:48 martin Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.32 2005/07/23 23:30:55 martin Exp $	*/
 /*	$NetBSD: cpu.h,v 1.45 1997/02/10 22:13:40 scottr Exp $	*/
 
 /*
@@ -310,7 +310,7 @@ void	PCIA(void);
 void	TBIA(void);
 void	TBIAS(void);
 void	TBIAU(void);
-void	TBIS(vm_offset_t);
+void	TBIS(vaddr_t);
 #if defined(M68040)
 void	DCFA(void);
 void	DCFP(paddr_t);
diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c
index 024a604bfa0..31f5198ab2b 100644
--- a/sys/arch/mac68k/mac68k/machdep.c
+++ b/sys/arch/mac68k/mac68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.116 2005/01/11 21:07:19 martin Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.117 2005/07/23 23:30:56 martin Exp $	*/
 /*	$NetBSD: machdep.c,v 1.207 1998/07/08 04:39:34 thorpej Exp $	*/
 
 /*
@@ -138,7 +138,7 @@ volatile u_char *Via1Base, *Via2Base, *PSCBase = NULL;
 u_long  NuBusBase = NBBASE;
 u_long  IOBase;
 
-vm_offset_t SCSIBase;
+vaddr_t SCSIBase;
 
 /* These are used to map kernel space: */
 extern int numranges;
@@ -244,7 +244,7 @@ void
 mac68k_init()
 {
 	int i;
-	extern vm_offset_t avail_start;
+	extern vaddr_t avail_start;
 
 	/*
 	 * Tell the VM system about available physical memory.
@@ -327,7 +327,7 @@ cpu_startup(void)
 	unsigned i;
 	int vers;
 	int base, residual;
-	vm_offset_t minaddr, maxaddr;
+	vaddr_t minaddr, maxaddr;
 	vm_size_t size = 0;	/* To avoid compiler warning */
 	int delay;
 
@@ -2424,7 +2424,7 @@ setmachdep()
  */
 void
 mac68k_set_io_offsets(base)
-	vm_offset_t base;
+	vaddr_t base;
 {
 	extern volatile u_char *sccA;