remove __BROKEN_INDIRECT_CONFIG cruft

4 files changed, 4 insertions, 21 deletions

diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index 91cb428e1d8..9719d5b8930 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_de.c,v 1.73 2005/06/26 01:38:39 brad Exp $	*/
+/*	$OpenBSD: if_de.c,v 1.74 2005/07/16 17:20:47 brad Exp $	*/
 /*	$NetBSD: if_de.c,v 1.45 1997/06/09 00:34:18 thorpej Exp $	*/
 
 /*-
@@ -4944,11 +4944,7 @@ static const int tulip_eisa_irqs[4] = { IRQ5, IRQ9, IRQ10, IRQ11 };
 static int
 tulip_pci_probe(
     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;
diff --git a/sys/dev/pci/if_devar.h b/sys/dev/pci/if_devar.h
index 07a45473fa7..87e6d65b67e 100644
--- a/sys/dev/pci/if_devar.h
+++ b/sys/dev/pci/if_devar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_devar.h,v 1.17 2005/04/16 16:08:07 deraadt Exp $	*/
+/*	$OpenBSD: if_devar.h,v 1.18 2005/07/16 17:20:47 brad Exp $	*/
 /*	$NetBSD: if_devar.h,v 1.13 1997/06/08 18:46:36 thorpej Exp $	*/
 
 /*-
@@ -30,10 +30,6 @@
 #if !defined(_DEVAR_H)
 #define _DEVAR_H
 
-#if defined(__OpenBSD__)
-#define __BROKEN_INDIRECT_CONFIG
-#endif
-
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 
 typedef bus_addr_t tulip_csrptr_t;
diff --git a/sys/dev/pci/if_lmc_obsd.c b/sys/dev/pci/if_lmc_obsd.c
index 9bf737070dc..7a1f65a7c4f 100644
--- a/sys/dev/pci/if_lmc_obsd.c
+++ b/sys/dev/pci/if_lmc_obsd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_lmc_obsd.c,v 1.14 2004/05/12 06:35:11 tedu Exp $ */
+/*	$OpenBSD: if_lmc_obsd.c,v 1.15 2005/07/16 17:20:47 brad Exp $ */
 /*	$NetBSD: if_lmc_nbsd.c,v 1.1 1999/03/25 03:32:43 explorer Exp $	*/
 
 /*-
@@ -179,11 +179,7 @@ static void lmc_shutdown(void *arg);
 
 static int
 lmc_pci_probe(struct device *parent,
-#if defined (__BROKEN_INDIRECT_CONFIG) || defined(__OpenBSD__)
 	       void *match,
-#else
-	       struct cfdata *match,
-#endif
 	       void *aux)
 {
 	struct pci_attach_args *pa = (struct pci_attach_args *)aux;
diff --git a/sys/dev/pci/sv.c b/sys/dev/pci/sv.c
index 01cb12be0c6..e7c0c1c7f61 100644
--- a/sys/dev/pci/sv.c
+++ b/sys/dev/pci/sv.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: sv.c,v 1.18 2005/04/16 21:57:23 mickey Exp $ */
+/*      $OpenBSD: sv.c,v 1.19 2005/07/16 17:20:47 brad Exp $ */
 
 /*
  * Copyright (c) 1998 Constantine Paul Sapuntzakis
@@ -72,12 +72,7 @@ static int	svdebug = 100;
 #define DPRINTFN(n,x)
 #endif
 
-#define __BROKEN_INDIRECT_CONFIG
-#ifdef __BROKEN_INDIRECT_CONFIG
 int	sv_match(struct device *, void *, void *);
-#else
-int	sv_match(struct device *, struct cfdata *, void *);
-#endif
 static void	sv_attach(struct device *, struct device *, void *);
 int	sv_intr(void *);