diff --git a/sys/arch/macppc/dev/z8530tty.c b/sys/arch/macppc/dev/z8530tty.c
index a522f8777ff2..21d50c9f4144 100644
--- a/sys/arch/macppc/dev/z8530tty.c
+++ b/sys/arch/macppc/dev/z8530tty.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: z8530tty.c,v 1.21 2003/12/04 13:05:16 keihan Exp $	*/
+/*	$NetBSD: z8530tty.c,v 1.22 2005/06/03 21:38:05 matt Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 1999
@@ -137,7 +137,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.21 2003/12/04 13:05:16 keihan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.22 2005/06/03 21:38:05 matt Exp $");
 
 #include "opt_kgdb.h"
 
@@ -1398,7 +1398,7 @@ zstty_rxsoft(zst, tp)
 	struct tty *tp;
 {
 	struct zs_chanstate *cs = zst->zst_cs;
-	int (*rint) __P((int c, struct tty *tp)) = tp->t_linesw->l_rint;
+	int (*rint)(int, struct tty *) = tp->t_linesw->l_rint;
 	u_char *get, *end;
 	u_int cc, scc;
 	u_char rr1;
diff --git a/sys/arch/macppc/dev/zs.c b/sys/arch/macppc/dev/zs.c
index 3b8e38717945..ecbbd81c2d54 100644
--- a/sys/arch/macppc/dev/zs.c
+++ b/sys/arch/macppc/dev/zs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: zs.c,v 1.32 2005/01/24 21:39:15 matt Exp $	*/
+/*	$NetBSD: zs.c,v 1.33 2005/06/03 21:38:05 matt Exp $	*/
 
 /*
  * Copyright (c) 1996, 1998 Bill Studenmund
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.32 2005/01/24 21:39:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.33 2005/06/03 21:38:05 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -971,7 +971,7 @@ zscngetc(dev_t dev)
 	int c;
 
 	if (zc) {
-		c = zs_getc((void *)zc);
+		c = zs_getc(__UNVOLATILE(zc));
 	} else {
 		char ch = 0;
 		OF_read(stdin, &ch, 1);
@@ -989,7 +989,7 @@ zscnputc(dev_t dev, int c)
 	volatile struct zschan *zc = zs_conschan;
 
 	if (zc) {
-		zs_putc((void *)zc, c);
+		zs_putc(__UNVOLATILE(zc), c);
 	} else {
 		char ch = c;
 		OF_write(stdout, &ch, 1);