From 805c7b6bc009c89fbb3e09999926e034853000ee Mon Sep 17 00:00:00 2001
From: drochner <drochner@NetBSD.org>
Date: Sun, 30 Nov 1997 15:31:23 +0000
Subject: [PATCH] make it compile without "__BROKEN_INDIRECT_CONFIG"

---
 sys/dev/isa/aic_isa.c    | 15 ++++++++++++---
 sys/dev/isa/i82365_isa.c | 13 +++++++++++--
 sys/dev/isa/if_el.c      | 13 +++++++++++--
 sys/dev/isa/if_iy.c      | 13 +++++++++++--
 4 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/sys/dev/isa/aic_isa.c b/sys/dev/isa/aic_isa.c
index c68f0d26c8c4..992a7d3a028d 100644
--- a/sys/dev/isa/aic_isa.c
+++ b/sys/dev/isa/aic_isa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aic_isa.c,v 1.4 1997/10/20 18:43:04 thorpej Exp $	*/
+/*	$NetBSD: aic_isa.c,v 1.5 1997/11/30 15:31:23 drochner Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995, 1996 Charles M. Hannum.  All rights reserved.
@@ -73,7 +73,11 @@
 #include <dev/ic/aic6360reg.h>
 #include <dev/ic/aic6360var.h>
 
-int	aic_isa_probe	__P((struct device *, void *, void *));
+#ifdef __BROKEN_INDIRECT_CONFIG
+int	aic_isa_probe __P((struct device *, void *, void *));
+#else
+int	aic_isa_probe __P((struct device *, struct cfdata *, void *));
+#endif
 
 struct aic_isa_softc {
 	struct	aic_softc sc_aic;	/* real "aic" softc */
@@ -98,7 +102,12 @@ struct cfattach aic_isa_ca = {
 int
 aic_isa_probe(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/isa/i82365_isa.c b/sys/dev/isa/i82365_isa.c
index 9fe98408116d..c996ac5e8778 100644
--- a/sys/dev/isa/i82365_isa.c
+++ b/sys/dev/isa/i82365_isa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: i82365_isa.c,v 1.7 1997/11/05 21:41:36 thorpej Exp $	*/
+/*	$NetBSD: i82365_isa.c,v 1.8 1997/11/30 15:31:24 drochner Exp $	*/
 
 #define	PCICISADEBUG
 
@@ -106,7 +106,11 @@ int	pcicisa_debug = 0 /* XXX */ ;
 #define	DPRINTF(arg)
 #endif
 
+#ifdef __BROKEN_INDIRECT_CONFIG
 int	pcic_isa_probe __P((struct device *, void *, void *));
+#else
+int	pcic_isa_probe __P((struct device *, struct cfdata *, void *));
+#endif
 void	pcic_isa_attach __P((struct device *, struct device *, void *));
 
 void	*pcic_isa_chip_intr_establish __P((pcmcia_chipset_handle_t,
@@ -138,7 +142,12 @@ static struct pcmcia_chip_functions pcic_isa_functions = {
 int
 pcic_isa_probe(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/isa/if_el.c b/sys/dev/isa/if_el.c
index b35682038f62..eac56ee1b344 100644
--- a/sys/dev/isa/if_el.c
+++ b/sys/dev/isa/if_el.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_el.c,v 1.49 1997/10/15 05:59:26 explorer Exp $	*/
+/*	$NetBSD: if_el.c,v 1.50 1997/11/30 15:31:25 drochner Exp $	*/
 
 /*
  * Copyright (c) 1994, Matthew E. Kimmel.  Permission is hereby granted
@@ -106,7 +106,11 @@ void elread __P((struct el_softc *, int));
 struct mbuf *elget __P((struct el_softc *sc, int));
 static inline void el_hardreset __P((struct el_softc *));
 
+#ifdef __BROKEN_INDIRECT_CONFIG
 int elprobe __P((struct device *, void *, void *));
+#else
+int elprobe __P((struct device *, struct cfdata *, void *));
+#endif
 void elattach __P((struct device *, struct device *, void *));
 
 struct cfattach el_ca = {
@@ -126,7 +130,12 @@ struct cfdriver el_cd = {
 int
 elprobe(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/isa/if_iy.c b/sys/dev/isa/if_iy.c
index 239c0fdcff73..f7364d3d7be9 100644
--- a/sys/dev/isa/if_iy.c
+++ b/sys/dev/isa/if_iy.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_iy.c,v 1.16 1997/10/20 18:43:14 thorpej Exp $	*/
+/*	$NetBSD: if_iy.c,v 1.17 1997/11/30 15:31:26 drochner Exp $	*/
 /* #define IYDEBUG */
 /* #define IYMEMDEBUG */
 /*-
@@ -153,7 +153,11 @@ int in_ifrint = 0;
 int in_iftint = 0;
 #endif
 
+#ifdef __BROKEN_INDIRECT_CONFIG
 int iyprobe __P((struct device *, void *, void *));
+#else
+int iyprobe __P((struct device *, struct cfdata *, void *));
+#endif
 void iyattach __P((struct device *, struct device *, void *));
 
 static u_int16_t eepromread __P((bus_space_tag_t, bus_space_handle_t, int));
@@ -175,7 +179,12 @@ static u_int8_t eepro_revirqmap[] = EEPP_RINTMAP;
 int
 iyprobe(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;
 	u_int16_t eaddr[8];