Sync with NetBSD 961207

1 files changed, 12 insertions, 3 deletions

diff --git a/sys/arch/alpha/tc/mcclock_ioasic.c b/sys/arch/alpha/tc/mcclock_ioasic.c
index 235fff4e901..2a5582895fb 100644
--- a/sys/arch/alpha/tc/mcclock_ioasic.c
+++ b/sys/arch/alpha/tc/mcclock_ioasic.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: mcclock_ioasic.c,v 1.3 1996/10/30 22:41:10 niklas Exp $	*/
-/*	$NetBSD: mcclock_ioasic.c,v 1.2 1996/04/17 22:22:58 cgd Exp $	*/
+/*	$OpenBSD: mcclock_ioasic.c,v 1.4 1997/01/24 19:58:14 niklas Exp $	*/
+/*	$NetBSD: mcclock_ioasic.c,v 1.3 1996/12/05 01:39:42 cgd Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -51,7 +51,11 @@ struct mcclock_ioasic_softc {
 	struct mcclock_ioasic_clockdatum *sc_dp;
 };
 
+#ifdef __BROKEN_INDIRECT_CONFIG
 int	mcclock_ioasic_match __P((struct device *, void *, void *));
+#else
+int	mcclock_ioasic_match __P((struct device *, struct cfdata *, void *));
+#endif
 void	mcclock_ioasic_attach __P((struct device *, struct device *, void *));
 
 struct cfattach mcclock_ioasic_ca = {
@@ -69,7 +73,12 @@ const struct mcclock_busfns mcclock_ioasic_busfns = {
 int
 mcclock_ioasic_match(parent, match, aux)
 	struct device *parent;
-	void *match, *aux;
+#ifdef __BROKEN_INDIRECT_CONFIG
+	void *match;
+#else
+	struct cfdata *match;
+#endif
+	void *aux;
 {
 	struct ioasicdev_attach_args *d = aux;