elliminate pci_bus_fixup.h by moving

pci_bus_fixup() proto into pcibiosvar.h

4 files changed, 4 insertions, 37 deletions

diff --git a/sys/arch/i386/pci/pci_bus_fixup.c b/sys/arch/i386/pci/pci_bus_fixup.c
index 50377ae7f82..965ce6dc28a 100644
--- a/sys/arch/i386/pci/pci_bus_fixup.c
+++ b/sys/arch/i386/pci/pci_bus_fixup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_bus_fixup.c,v 1.6 2000/10/31 18:56:42 deraadt Exp $	*/
+/*	$OpenBSD: pci_bus_fixup.c,v 1.7 2001/01/24 23:16:14 mickey Exp $	*/
 /*	$NetBSD: pci_bus_fixup.c,v 1.1 1999/11/17 07:32:58 thorpej Exp $  */
 
 /*
@@ -42,7 +42,6 @@
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/ppbreg.h>
 
-#include <i386/pci/pci_bus_fixup.h>
 #include <i386/pci/pcibiosvar.h>
 
 int
diff --git a/sys/arch/i386/pci/pci_bus_fixup.h b/sys/arch/i386/pci/pci_bus_fixup.h
deleted file mode 100644
index 6a4252dc0bc..00000000000
--- a/sys/arch/i386/pci/pci_bus_fixup.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*	$OpenBSD: pci_bus_fixup.h,v 1.3 2000/03/28 03:37:59 mickey Exp $	*/
-/*	$NetBSD: pci_bus_fixup.h,v 1.1 1999/11/17 07:32:58 thorpej Exp $  */
-
-/*
- * Copyright (c) 1999, by UCHIYAMA Yasushi
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. The name of the developer may NOT be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
- * SUCH DAMAGE. 
- */
-
-int	pci_bus_fixup __P((pci_chipset_tag_t, int));
diff --git a/sys/arch/i386/pci/pcibios.c b/sys/arch/i386/pci/pcibios.c
index 0924cb55ed5..cf98915ae90 100644
--- a/sys/arch/i386/pci/pcibios.c
+++ b/sys/arch/i386/pci/pcibios.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcibios.c,v 1.17 2000/10/31 18:56:42 deraadt Exp $	*/
+/*	$OpenBSD: pcibios.c,v 1.18 2001/01/24 23:16:14 mickey Exp $	*/
 /*	$NetBSD: pcibios.c,v 1.5 2000/08/01 05:23:59 uch Exp $	*/
 
 /*
@@ -111,7 +111,6 @@
 
 #include <i386/pci/pcibiosvar.h>
 #include <i386/pci/pci_intr_fixup.h>
-#include <i386/pci/pci_bus_fixup.h>
 #include <i386/pci/pci_addr_fixup.h>
 
 #include <machine/biosvar.h>
diff --git a/sys/arch/i386/pci/pcibiosvar.h b/sys/arch/i386/pci/pcibiosvar.h
index 6b944a44da3..6cb0a1b0745 100644
--- a/sys/arch/i386/pci/pcibiosvar.h
+++ b/sys/arch/i386/pci/pcibiosvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcibiosvar.h,v 1.1 2000/10/31 18:56:42 deraadt Exp $	*/
+/*	$OpenBSD: pcibiosvar.h,v 1.2 2001/01/24 23:16:14 mickey Exp $	*/
 /*	$NetBSD: pcibios.h,v 1.2 2000/04/28 17:15:16 uch Exp $	*/
 
 /*
@@ -95,9 +95,6 @@ extern struct pcibios_intr_routing *pcibios_pir_table;
 extern int pcibios_pir_table_nentries;
 extern int pcibios_max_bus;
 
-void pci_device_foreach __P((pci_chipset_tag_t, int,
-			     void (*) (pci_chipset_tag_t, pcitag_t)));
-
 #ifdef PCIBIOSVERBOSE
 extern int pcibiosverbose;
 
@@ -116,6 +113,7 @@ extern int pcibiosverbose;
 #define	PCIBIOS_PRINTVN(n, arg)
 #endif
 
+int  pci_bus_fixup __P((pci_chipset_tag_t, int));
 void pci_device_foreach __P((pci_chipset_tag_t, int,
     void (*) __P((pci_chipset_tag_t, pcitag_t))));