6 files changed, 28 insertions, 28 deletions
diff --git a/sys/arch/amd64/pci/pchb.c b/sys/arch/amd64/pci/pchb.c
index 4d1b614d7b3..339f26ccb83 100644
--- a/sys/arch/amd64/pci/pchb.c
+++ b/sys/arch/amd64/pci/pchb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pchb.c,v 1.1 2004/01/28 01:39:39 mickey Exp $	*/
+/*	$OpenBSD: pchb.c,v 1.2 2004/06/14 00:32:30 deraadt Exp $	*/
 /*	$NetBSD: pchb.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $	*/
 
 /*-
@@ -71,10 +71,10 @@
 #define I82424_BCTL_PCIMEM_BURSTEN	0x01
 #define I82424_BCTL_PCI_BURSTEN		0x02
 
-int	pchbmatch __P((struct device *, void *, void *));
-void	pchbattach __P((struct device *, struct device *, void *));
+int	pchbmatch(struct device *, void *, void *);
+void	pchbattach(struct device *, struct device *, void *);
 
-int	pchb_print __P((void *, const char *));
+int	pchb_print(void *, const char *);
 
 struct cfattach pchb_ca = {
 	sizeof(struct pchb_softc), pchbmatch, pchbattach,
diff --git a/sys/arch/hppa/include/loadfile_machdep.h b/sys/arch/hppa/include/loadfile_machdep.h
index 631ebcd5615..88d67f0e947 100644
--- a/sys/arch/hppa/include/loadfile_machdep.h
+++ b/sys/arch/hppa/include/loadfile_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loadfile_machdep.h,v 1.1 2002/10/24 19:27:15 mickey Exp $	*/
+/*	$OpenBSD: loadfile_machdep.h,v 1.2 2004/06/14 00:32:31 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -74,9 +74,9 @@
 #define	ALLOC(a)		malloc(a)
 #define	FREE(a, b)		free(a)
 
-ssize_t vread __P((int, u_long, u_long *, size_t));
-void vcopy __P((u_long, u_long, u_long *, size_t));
-void vzero __P((u_long, u_long *, size_t));
+ssize_t vread(int, u_long, u_long *, size_t);
+void vcopy(u_long, u_long, u_long *, size_t);
+void vzero(u_long, u_long *, size_t);
 
 #endif
 #endif /* ! _HPPA_LOADFILE_MACHDEP_H_ */
diff --git a/sys/arch/hppa/stand/boot/exec.c b/sys/arch/hppa/stand/boot/exec.c
index 50c2538b96c..8dd0c20771f 100644
--- a/sys/arch/hppa/stand/boot/exec.c
+++ b/sys/arch/hppa/stand/boot/exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.c,v 1.3 2004/04/07 18:24:20 mickey Exp $	*/
+/*	$OpenBSD: exec.c,v 1.4 2004/06/14 00:32:31 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2002-2004 Michael Shalayeff
@@ -33,7 +33,7 @@
 #include <stand/boot/bootarg.h>
 #include "dev_hppa.h"
 
-typedef void (*startfuncp) __P((int, int, int, int, int, int, caddr_t))
+typedef void (*startfuncp)(int, int, int, int, int, int, caddr_t)
     __attribute__ ((noreturn));
 
 void
diff --git a/sys/arch/hppa/stand/cdboot/cdboot.c b/sys/arch/hppa/stand/cdboot/cdboot.c
index d6733f1fea1..47715f6c8ef 100644
--- a/sys/arch/hppa/stand/cdboot/cdboot.c
+++ b/sys/arch/hppa/stand/cdboot/cdboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cdboot.c,v 1.6 2004/04/07 18:24:20 mickey Exp $	*/
+/*	$OpenBSD: cdboot.c,v 1.7 2004/06/14 00:32:31 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2003 Michael Shalayeff
@@ -59,7 +59,7 @@ struct consdev	constab[] = {
 };
 struct consdev *cn_tab;
 
-typedef void (*startfuncp) __P((int, int, int, int, int, int, caddr_t))
+typedef void (*startfuncp)(int, int, int, int, int, int, caddr_t)
     __attribute__ ((noreturn));
 
 void
diff --git a/sys/arch/macppc/dev/mediabay.c b/sys/arch/macppc/dev/mediabay.c
index 6eeb0720ac4..b4ec6a0d5f6 100644
--- a/sys/arch/macppc/dev/mediabay.c
+++ b/sys/arch/macppc/dev/mediabay.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mediabay.c,v 1.1 2004/05/10 21:29:53 drahn Exp $	*/
+/*	$OpenBSD: mediabay.c,v 1.2 2004/06/14 00:32:31 deraadt Exp $	*/
 /*	$NetBSD: mediabay.c,v 1.9 2003/07/15 02:43:29 lukem Exp $	*/
 
 /*-
@@ -54,13 +54,13 @@ struct mediabay_softc {
 	struct proc *sc_kthread;
 };
 
-void mediabay_attach __P((struct device *, struct device *, void *));
-int mediabay_match __P((struct device *, void *, void *));
-int mediabay_print __P((void *, const char *));
-void mediabay_attach_content __P((struct mediabay_softc *));
-int mediabay_intr __P((void *));
-void mediabay_create_kthread __P((void *));
-void mediabay_kthread __P((void *));
+void mediabay_attach(struct device *, struct device *, void *);
+int mediabay_match(struct device *, void *, void *);
+int mediabay_print(void *, const char *);
+void mediabay_attach_content(struct mediabay_softc *);
+int mediabay_intr(void *);
+void mediabay_create_kthread(void *);
+void mediabay_kthread(void *);
 
 struct cfattach mediabay_ca = {
 	sizeof(struct mediabay_softc), mediabay_match, mediabay_attach
diff --git a/sys/arch/macppc/include/z8530var.h b/sys/arch/macppc/include/z8530var.h
index 094b1549df8..fa7a00e450b 100644
--- a/sys/arch/macppc/include/z8530var.h
+++ b/sys/arch/macppc/include/z8530var.h
@@ -112,26 +112,26 @@ struct zsc_softc {
  * XXX - no one seems to want to try and check this -wrs
  */
 
-u_char zs_read_reg __P((struct zs_chanstate *cs, u_char reg));
-u_char zs_read_csr __P((struct zs_chanstate *cs));
-u_char zs_read_data __P((struct zs_chanstate *cs));
+u_char zs_read_reg(struct zs_chanstate *cs, u_char reg);
+u_char zs_read_csr(struct zs_chanstate *cs);
+u_char zs_read_data(struct zs_chanstate *cs);
 
-void  zs_write_reg __P((struct zs_chanstate *cs, u_char reg, u_char val));
-void  zs_write_csr __P((struct zs_chanstate *cs, u_char val));
-void  zs_write_data __P((struct zs_chanstate *cs, u_char val));
+void  zs_write_reg(struct zs_chanstate *cs, u_char reg, u_char val);
+void  zs_write_csr(struct zs_chanstate *cs, u_char val);
+void  zs_write_data(struct zs_chanstate *cs, u_char val);
 
 /* XXX - Could define splzs() here instead of in psl.h */
 #define splzs spltty
 
 /* Hook for MD ioctl support */
-int	zsmdioctl __P((struct zs_chanstate *cs, u_long cmd, caddr_t data));
+int	zsmdioctl(struct zs_chanstate *cs, u_long cmd, caddr_t data);
 /* XXX - This is a bit gross... */
 /*
 #define ZS_MD_IOCTL(cs, cmd, data) zsmdioctl(cs, cmd, data)
 */
 
 /* Callback for "external" clock sources */
-void zsmd_setclock  __P((struct zs_chanstate *cs));
+void zsmd_setclock(struct zs_chanstate *cs);
 #define ZS_MD_SETCLK(cs) zsmd_setclock(cs)
 
 #define PCLK	(9600 * 384)	/* PCLK pin input clock rate */