remove last traces of __BROKEN_INDIRECT_CONFIG.

Thanks to aanriot@ and Michael Knudsen for checking that alpha/i386/macppc
kernels still compile.

8 files changed, 8 insertions, 68 deletions

diff --git a/sys/arch/alpha/include/types.h b/sys/arch/alpha/include/types.h
index 03012b5e792..8782fa8038a 100644
--- a/sys/arch/alpha/include/types.h
+++ b/sys/arch/alpha/include/types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: types.h,v 1.17 2005/12/17 07:31:23 miod Exp $	*/
+/*	$OpenBSD: types.h,v 1.18 2006/01/02 05:21:20 brad Exp $	*/
 /*	$NetBSD: types.h,v 1.6 1996/12/05 00:13:47 cgd Exp $	*/
 
 /*-
@@ -70,7 +70,6 @@ typedef	unsigned long long	 uint64_t;
 
 typedef long			register_t;
 
-#define	__BROKEN_INDIRECT_CONFIG
 #define	__HAVE_DEVICE_REGISTER
 
 #endif	/* _MACHTYPES_H_ */
diff --git a/sys/arch/alpha/isa/mcclock_isa.c b/sys/arch/alpha/isa/mcclock_isa.c
index 5f6273a1856..d33f8aaa591 100644
--- a/sys/arch/alpha/isa/mcclock_isa.c
+++ b/sys/arch/alpha/isa/mcclock_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mcclock_isa.c,v 1.7 2002/03/14 01:26:27 millert Exp $	*/
+/*	$OpenBSD: mcclock_isa.c,v 1.8 2006/01/02 05:21:24 brad Exp $	*/
 /*	$NetBSD: mcclock_isa.c,v 1.5 1996/12/05 01:39:29 cgd Exp $	*/
 
 /*
@@ -47,11 +47,7 @@ struct mcclock_isa_softc {
 	bus_space_handle_t	sc_ioh;
 };
 
-#ifdef __BROKEN_INDIRECT_CONFIG
 int	mcclock_isa_match(struct device *, void *, void *);
-#else
-int	mcclock_isa_match(struct device *, struct cfdata *, void *);
-#endif
 void	mcclock_isa_attach(struct device *, struct device *, void *);
 
 struct cfattach mcclock_isa_ca = {
@@ -69,11 +65,7 @@ const struct mcclock_busfns mcclock_isa_busfns = {
 int
 mcclock_isa_match(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
 	void *match;
-#else
-	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct isa_attach_args *ia = aux;
diff --git a/sys/arch/alpha/pci/sio.c b/sys/arch/alpha/pci/sio.c
index 3e489ca388e..ab38f434d9b 100644
--- a/sys/arch/alpha/pci/sio.c
+++ b/sys/arch/alpha/pci/sio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sio.c,v 1.30 2004/12/06 19:51:41 brad Exp $	*/
+/*	$OpenBSD: sio.c,v 1.31 2006/01/02 05:21:26 brad Exp $	*/
 /*	$NetBSD: sio.c,v 1.15 1996/12/05 01:39:36 cgd Exp $	*/
 
 /*
@@ -55,11 +55,7 @@ struct sio_softc {
 	int		sc_haseisa;
 };
 
-#ifdef __BROKEN_INDIRECT_CONFIG
 int	siomatch(struct device *, void *, void *);
-#else
-int	siomatch(struct device *, struct cfdata *, void *);
-#endif
 void	sioattach(struct device *, struct device *, void *);
 
 extern int sio_intr_alloc(isa_chipset_tag_t *, int, int, int *);
@@ -73,11 +69,7 @@ struct cfdriver sio_cd = {
 	NULL, "sio", DV_DULL,
 };
 
-#ifdef __BROKEN_INDIRECT_CONFIG
 int	pcebmatch(struct device *, void *, void *);
-#else
-int	pcebmatch(struct device *, struct cfdata *, void *);
-#endif
 
 struct cfattach pceb_ca = {
 	sizeof(struct sio_softc), pcebmatch, sioattach,
@@ -105,11 +97,7 @@ void	sio_bridge_callback(struct device *);
 int
 siomatch(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
 	void *match;
-#else
-	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct pci_attach_args *pa = aux;
@@ -136,11 +124,7 @@ siomatch(parent, match, aux)
 int
 pcebmatch(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
 	void *match;
-#else
-	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct pci_attach_args *pa = aux;
diff --git a/sys/arch/alpha/tc/cfb.c b/sys/arch/alpha/tc/cfb.c
index dc4e0955d65..a38c7af2046 100644
--- a/sys/arch/alpha/tc/cfb.c
+++ b/sys/arch/alpha/tc/cfb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cfb.c,v 1.15 2005/10/28 19:10:26 martin Exp $	*/
+/*	$OpenBSD: cfb.c,v 1.16 2006/01/02 05:21:28 brad Exp $	*/
 /*	$NetBSD: cfb.c,v 1.7 1996/12/05 01:39:39 cgd Exp $	*/
 
 /*
@@ -52,11 +52,7 @@
 #include <machine/autoconf.h>
 #include <machine/pte.h>
 
-#ifdef __BROKEN_INDIRECT_CONFIG
 int	cfbmatch(struct device *, void *, void *);
-#else
-int	cfbmatch(struct device *, struct cfdata *, void *);
-#endif
 void	cfbattach(struct device *, struct device *, void *);
 
 struct cfattach cfb_ca = {
@@ -119,11 +115,7 @@ struct wsdisplay_accessops cfb_accessops = {
 int
 cfbmatch(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
 	void *match;
-#else
-	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct tc_attach_args *ta = aux;
diff --git a/sys/arch/alpha/tc/sfb.c b/sys/arch/alpha/tc/sfb.c
index 872f2cd82e2..9d056b55d50 100644
--- a/sys/arch/alpha/tc/sfb.c
+++ b/sys/arch/alpha/tc/sfb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sfb.c,v 1.15 2005/10/28 19:10:26 martin Exp $	*/
+/*	$OpenBSD: sfb.c,v 1.16 2006/01/02 05:21:28 brad Exp $	*/
 /*	$NetBSD: sfb.c,v 1.7 1996/12/05 01:39:44 cgd Exp $	*/
 
 /*
@@ -52,11 +52,7 @@
 #include <machine/autoconf.h>
 #include <machine/pte.h>
 
-#ifdef __BROKEN_INDIRECT_CONFIG
 int	sfbmatch(struct device *, void *, void *);
-#else
-int	sfbmatch(struct device *, struct cfdata *, void *);
-#endif
 void	sfbattach(struct device *, struct device *, void *);
 
 struct cfattach sfb_ca = {
@@ -122,11 +118,7 @@ struct wsdisplay_accessops sfb_accessops = {
 int
 sfbmatch(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
 	void *match;
-#else
-	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct tc_attach_args *ta = aux;
diff --git a/sys/arch/i386/isa/clock.c b/sys/arch/i386/isa/clock.c
index fa18701776d..7d12127563f 100644
--- a/sys/arch/i386/isa/clock.c
+++ b/sys/arch/i386/isa/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.32 2004/06/13 21:49:16 niklas Exp $	*/
+/*	$OpenBSD: clock.c,v 1.33 2006/01/02 05:21:30 brad Exp $	*/
 /*	$NetBSD: clock.c,v 1.39 1996/05/12 23:11:54 mycroft Exp $	*/
 
 /*-
@@ -109,12 +109,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #if (NPCPPI > 0)
 #include <dev/isa/pcppivar.h>
 
-#define __BROKEN_INDIRECT_CONFIG /* XXX */
-#ifdef __BROKEN_INDIRECT_CONFIG
 int sysbeepmatch(struct device *, void *, void *);
-#else
-int sysbeepmatch(struct device *, struct cfdata *, void *);
-#endif
 void sysbeepattach(struct device *, struct device *, void *);
 
 struct cfattach sysbeep_ca = {
@@ -387,11 +382,7 @@ i8254_delay(n)
 int
 sysbeepmatch(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
 	void *match;
-#else
-	struct cfdata *match;
-#endif
 	void *aux;
 {
 	return (!ppi_attached);
diff --git a/sys/arch/macppc/pci/vgafb_pci.c b/sys/arch/macppc/pci/vgafb_pci.c
index c5bc4e29b1a..ab7b6781a3c 100644
--- a/sys/arch/macppc/pci/vgafb_pci.c
+++ b/sys/arch/macppc/pci/vgafb_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vgafb_pci.c,v 1.15 2005/03/15 21:10:37 miod Exp $	*/
+/*	$OpenBSD: vgafb_pci.c,v 1.16 2006/01/02 05:21:32 brad Exp $	*/
 /*	$NetBSD: vga_pci.c,v 1.4 1996/12/05 01:39:38 cgd Exp $	*/
 
 /*
@@ -66,11 +66,7 @@ struct vgafb_pci_softc {
 int vgafb_pci_probe(struct pci_attach_args *pa, int id, u_int32_t *ioaddr,
     u_int32_t *iosize, u_int32_t *memaddr, u_int32_t *memsize,
     u_int32_t *cacheable, u_int32_t *mmioaddr, u_int32_t *mmiosize);
-#ifdef __BROKEN_INDIRECT_CONFIG
 int	vgafb_pci_match(struct device *, void *, void *);
-#else
-int	vgafb_pci_match(struct device *, struct cfdata *, void *);
-#endif
 void	vgafb_pci_attach(struct device *, struct device *, void *);
 
 paddr_t	vgafbpcimmap(void *, off_t, int);
@@ -230,11 +226,7 @@ vgafb_pci_probe(struct pci_attach_args *pa, int id, u_int32_t *ioaddr,
 int
 vgafb_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 = aux;
diff --git a/sys/arch/powerpc/include/types.h b/sys/arch/powerpc/include/types.h
index 06d6cd0736f..73a7ec7d219 100644
--- a/sys/arch/powerpc/include/types.h
+++ b/sys/arch/powerpc/include/types.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: types.h,v 1.1 1996/09/30 16:34:36 ws Exp $	*/
-/*	$OpenBSD: types.h,v 1.17 2005/12/17 07:31:26 miod Exp $	*/
+/*	$OpenBSD: types.h,v 1.18 2006/01/02 05:21:34 brad Exp $	*/
 
 /*-
  * Copyright (C) 1995 Wolfgang Solfrank.
@@ -66,6 +66,4 @@ typedef struct label_t {
 } label_t;
 #endif
 
-#define	__BROKEN_INDIRECT_CONFIG
-
 #endif	/* _POWERPC_TYPES_H_ */