From ec7941bba2a5242e3c8b3ff04d3d5a12f62b6037 Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Mon, 8 Jun 1998 06:45:55 +0000
Subject: [PATCH] Nuke __BROKEN_INDIRECT_CONFIG.

---
 sys/arch/i386/isa/joy_isapnp.c | 10 +---------
 sys/arch/i386/pci/pceb.c       | 10 +---------
 sys/arch/i386/pci/pchb.c       | 10 +---------
 sys/arch/i386/pci/pcib.c       | 10 +---------
 4 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/sys/arch/i386/isa/joy_isapnp.c b/sys/arch/i386/isa/joy_isapnp.c
index 0bd939633f73..cb2c93ded590 100644
--- a/sys/arch/i386/isa/joy_isapnp.c
+++ b/sys/arch/i386/isa/joy_isapnp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: joy_isapnp.c,v 1.12 1998/03/22 12:53:55 drochner Exp $	*/
+/*	$NetBSD: joy_isapnp.c,v 1.13 1998/06/08 06:47:15 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -49,11 +49,7 @@
 
 #include <i386/isa/joyvar.h>
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-int	joy_isapnp_match __P((struct device *, void *, void *));
-#else
 int	joy_isapnp_match __P((struct device *, struct cfdata *, void *));
-#endif
 void	joy_isapnp_attach __P((struct device *, struct device *, void *));
 
 struct cfattach joy_isapnp_ca = {
@@ -63,11 +59,7 @@ struct cfattach joy_isapnp_ca = {
 int
 joy_isapnp_match(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-	void *match;
-#else
 	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct isapnp_attach_args *ipa = aux;
diff --git a/sys/arch/i386/pci/pceb.c b/sys/arch/i386/pci/pceb.c
index 99ef3fc2025c..eb317f58e51f 100644
--- a/sys/arch/i386/pci/pceb.c
+++ b/sys/arch/i386/pci/pceb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pceb.c,v 1.2 1998/02/06 08:00:52 thorpej Exp $	*/
+/*	$NetBSD: pceb.c,v 1.3 1998/06/08 06:45:55 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -54,11 +54,7 @@
 #include "eisa.h"
 #include "isa.h"
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-int	pcebmatch __P((struct device *, void *, void *));
-#else
 int	pcebmatch __P((struct device *, struct cfdata *, void *));
-#endif
 void	pcebattach __P((struct device *, struct device *, void *));
 
 struct cfattach pceb_ca = {
@@ -77,11 +73,7 @@ union pceb_attach_args {
 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/i386/pci/pchb.c b/sys/arch/i386/pci/pchb.c
index 7ca3ca2cb929..9c03b4fbbbcc 100644
--- a/sys/arch/i386/pci/pchb.c
+++ b/sys/arch/i386/pci/pchb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pchb.c,v 1.13 1998/02/06 08:00:53 thorpej Exp $	*/
+/*	$NetBSD: pchb.c,v 1.14 1998/06/08 06:45:55 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -65,11 +65,7 @@
 #define I82424_BCTL_PCIMEM_BURSTEN	0x01
 #define I82424_BCTL_PCI_BURSTEN		0x02
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-int	pchbmatch __P((struct device *, void *, void *));
-#else
 int	pchbmatch __P((struct device *, struct cfdata *, void *));
-#endif
 void	pchbattach __P((struct device *, struct device *, void *));
 
 int	pchb_print __P((void *, const char *));
@@ -81,11 +77,7 @@ struct cfattach pchb_ca = {
 int
 pchbmatch(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/i386/pci/pcib.c b/sys/arch/i386/pci/pcib.c
index ad148e72fde8..845d64191e46 100644
--- a/sys/arch/i386/pci/pcib.c
+++ b/sys/arch/i386/pci/pcib.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcib.c,v 1.12 1998/03/28 02:12:02 cgd Exp $	*/
+/*	$NetBSD: pcib.c,v 1.13 1998/06/08 06:45:55 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -52,11 +52,7 @@
 
 #include "isa.h"
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-int	pcibmatch __P((struct device *, void *, void *));
-#else
 int	pcibmatch __P((struct device *, struct cfdata *, void *));
-#endif
 void	pcibattach __P((struct device *, struct device *, void *));
 
 struct cfattach pcib_ca = {
@@ -69,11 +65,7 @@ int	pcib_print __P((void *, const char *));
 int
 pcibmatch(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;