diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c
index 60b4e4d3b228..fa14478698e5 100644
--- a/sys/dev/isa/wds.c
+++ b/sys/dev/isa/wds.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wds.c,v 1.25 1997/11/04 06:16:13 thorpej Exp $	*/
+/*	$NetBSD: wds.c,v 1.26 1997/11/30 15:24:00 drochner Exp $	*/
 
 #undef WDSDIAG
 #ifdef DDB
@@ -219,7 +219,11 @@ struct scsipi_device wds_dev = {
 	NULL,			/* Use default 'done' routine */
 };
 
+#ifdef __BROKEN_INDIRECT_CONFIG
 int	wdsprobe __P((struct device *, void *, void *));
+#else
+int	wdsprobe __P((struct device *, struct cfdata *, void *));
+#endif
 void	wdsattach __P((struct device *, struct device *, void *));
 
 struct cfattach wds_ca = {
@@ -319,7 +323,12 @@ wds_cmd(iot, ioh, ibuf, icnt)
 int
 wdsprobe(parent, match, aux)
 	struct device *parent;
-	void *match, *aux;
+#ifdef __BROKEN_INDIRECT_CONFIG
+	void *match;
+#else
+	struct cfdata *match;
+#endif
+	void *aux;
 {
 	struct isa_attach_args *ia = aux;
 	bus_space_tag_t iot = ia->ia_iot;
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index 0092e4c95860..f85e11339f88 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tl.c,v 1.6 1997/11/18 12:26:09 bouyer Exp $	*/
+/*	$NetBSD: if_tl.c,v 1.7 1997/11/30 15:18:58 drochner Exp $	*/
 
 /*
  * Copyright (c) 1997 Manuel Bouyer.  All rights reserved.
@@ -164,7 +164,11 @@ typedef u_long ioctl_cmd_t;
 	bus_space_write_1(sc->tl_bustag, sc->tl_bushandle, (reg), (data))
 #define ETHER_MIN_TX (ETHERMIN + sizeof(struct ether_header))
 
+#ifdef __BROKEN_INDIRECT_CONFIG
 static int tl_pci_match __P((struct device *, void *, void *));
+#else
+static int tl_pci_match __P((struct device *, struct cfdata *, void *));
+#endif
 static void tl_pci_attach __P((struct device *, struct device *, void *));
 static int tl_intr __P((void *));
 
@@ -308,7 +312,11 @@ static char *nullbuf = NULL;
 static int
 tl_pci_match(parent, match, aux)
 	struct device *parent;
+#ifdef __BROKEN_INDIRECT_CONFIG
 	void *match;
+#else
+	struct cfdata *match;
+#endif
 	void *aux;
 {
 	struct pci_attach_args *pa = (struct pci_attach_args *) aux;