remove last traces of __BROKEN_INDIRECT_CONFIG.

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

1 files changed, 1 insertions, 17 deletions

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;