summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorcgd <cgd@NetBSD.org>1997-03-13 01:04:02 +0000
committercgd <cgd@NetBSD.org>1997-03-13 01:04:02 +0000
commit8aa5282c68df08a2f07e37b087c7a34bf12b7159 (patch)
tree392cd95956a636c6ca351cdab645e7e5418239bc /sys/dev
parent96153388c0966033355081f3580020218449ba09 (diff)
clean up the __BROKEN_INDIRECT_CONFIG chunks of the last change
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/ahc_pci.c7
-rw-r--r--sys/dev/pci/bha_pci.c7
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c
index b9c880dddcd..d02cd266112 100644
--- a/sys/dev/pci/ahc_pci.c
+++ b/sys/dev/pci/ahc_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ahc_pci.c,v 1.10 1997/03/13 00:38:52 cgd Exp $ */
+/* $NetBSD: ahc_pci.c,v 1.11 1997/03/13 01:04:02 cgd Exp $ */
/*
* Product specific probe and attach routines for:
@@ -270,10 +270,11 @@ int
ahc_pci_probe(parent, match, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
- void *match, *aux;
+ void *match;
#else
- struct cfdata *match; void *aux;
+ struct cfdata *match;
#endif
+ void *aux;
{
struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/bha_pci.c b/sys/dev/pci/bha_pci.c
index 479e20255a4..b61d92c08ae 100644
--- a/sys/dev/pci/bha_pci.c
+++ b/sys/dev/pci/bha_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bha_pci.c,v 1.8 1997/03/13 00:38:53 cgd Exp $ */
+/* $NetBSD: bha_pci.c,v 1.9 1997/03/13 01:04:04 cgd Exp $ */
/*
* Copyright (c) 1994, 1996 Charles M. Hannum. All rights reserved.
@@ -68,10 +68,11 @@ int
bha_pci_match(parent, match, aux)
struct device *parent;
#ifdef __BROKEN_INDIRECT_CONFIG
- void *match, *aux;
+ void *match;
#else
- struct cfdata *match; void *aux;
+ struct cfdata *match;
#endif
+ void *aux;
{
struct pci_attach_args *pa = aux;
bus_space_tag_t iot = pa->pa_iot;