20 files changed, 26 insertions, 104 deletions

diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c
index 27bfc0df63ed..73b862232432 100644
--- a/sys/dev/advansys/adv_pci.c
+++ b/sys/dev/advansys/adv_pci.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adv_pci.c,v 1.4 1998/12/22 18:14:15 gibbs Exp $
+ *	$Id: adv_pci.c,v 1.5 1999/04/24 20:13:58 peter Exp $
  */
 
 #include <pci.h>
@@ -95,11 +95,7 @@ static struct  pci_device adv_pci_driver = {
 	NULL
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (adv_pci, adv_pci_driver);
-#else
-DATA_SET (pcidevice_set, adv_pci_driver);
-#endif /* COMPAT_PCI_DRIVER */
 
 static const char*
 advpciprobe(pcici_t tag, pcidi_t type)
diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c
index 6efed69d85ca..85e7c927f5aa 100644
--- a/sys/dev/advansys/adw_pci.c
+++ b/sys/dev/advansys/adw_pci.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adw_pci.c,v 1.3 1998/12/14 06:32:54 dillon Exp $
+ *	$Id: adw_pci.c,v 1.4 1999/04/24 20:13:58 peter Exp $
  */
 
 #include <pci.h>
@@ -69,11 +69,7 @@ static struct  pci_device adw_pci_driver = {
 	NULL
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (adw_pci, adw_pci_driver);
-#else
-DATA_SET (pcidevice_set, adw_pci_driver);
-#endif /* COMPAT_PCI_DRIVER */
 
 static const char*
 adwpciprobe(pcici_t tag, pcidi_t type)
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index cb5093f9e9da..96533cd606eb 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/* $Id: brooktree848.c,v 1.72 1999/04/29 10:15:55 roger Exp $ */
+/* $Id: brooktree848.c,v 1.73 1999/04/30 11:16:30 roger Exp $ */
 /* BT848 Driver for Brooktree's Bt848, Bt849, Bt878 and Bt 879 based cards.
    The Brooktree  BT848 Driver driver is based upon Mark Tinguely and
    Jim Lowe's driver for the Matrox Meteor PCI card . The 
@@ -527,11 +527,7 @@ static struct	pci_device bktr_device = {
 	&bktr_count
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (bktr, bktr_device);
-#else
-DATA_SET (pcidevice_set, bktr_device);
-#endif /* COMPAT_PCI_DRIVER */
 
 static	d_open_t	bktr_open;
 static	d_close_t	bktr_close;
diff --git a/sys/dev/cy/cy_pci.c b/sys/dev/cy/cy_pci.c
index 203abc45ed0f..f6cd10c9ff3c 100644
--- a/sys/dev/cy/cy_pci.c
+++ b/sys/dev/cy/cy_pci.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cy_pci.c,v 1.12 1999/04/24 20:13:58 peter Exp $
+ *	$Id: cy_pci.c,v 1.13 1999/05/02 20:42:13 peter Exp $
  */
 
 /*
@@ -65,11 +65,7 @@ static struct pci_device cy_device = {
         &cy_count,
         NULL
 };
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER(cy_pci, cy_device);
-#else
-DATA_SET(pcidevice_set, cy_device);
-#endif /* COMPAT_PCI_DRIVER */
 
 static const char *
 cy_probe(config_id, device_id)
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 8728d3992a45..fef317c19fed 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_de.c,v 1.82 1999/02/28 17:08:51 explorer Exp $	*/
-/*	$Id: if_de.c,v 1.103 1999/04/24 20:13:59 peter Exp $ */
+/*	$Id: if_de.c,v 1.104 1999/05/03 09:36:29 dfr Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -5378,11 +5378,7 @@ static struct pci_device dedevice = {
 #endif
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER(de, dedevice);
-#else
-DATA_SET (pcidevice_set, dedevice);
-#endif /* COMPAT_PCI_DRIVER */
 #endif /* __FreeBSD__ */
 
 #if defined(__bsdi__)
diff --git a/sys/dev/dpt/dpt_pci.c b/sys/dev/dpt/dpt_pci.c
index 69ba362478a1..3caaf45ce2fe 100644
--- a/sys/dev/dpt/dpt_pci.c
+++ b/sys/dev/dpt/dpt_pci.c
@@ -32,7 +32,7 @@
  *  dptpci.c:  PCI Bus Attachment for DPT SCSI HBAs
  */
 
-#ident "$Id: dpt_pci.c,v 1.11 1998/12/14 06:32:55 dillon Exp $"
+#ident "$Id: dpt_pci.c,v 1.12 1999/04/24 20:13:58 peter Exp $"
 
 #include "opt_devfs.h"
 #include "opt_dpt.h"
@@ -78,11 +78,7 @@ static  struct pci_device dpt_pci_driver =
 	NULL
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER(dpt_pci, dpt_pci_driver);
-#else
-DATA_SET(pcidevice_set, dpt_pci_driver);
-#endif /* COMPAT_PCI_DRIVER */
 
 /*
  * Probe the PCI device.
diff --git a/sys/dev/ed/if_ed_pci.c b/sys/dev/ed/if_ed_pci.c
index ee47d80285aa..c96fa25e1918 100644
--- a/sys/dev/ed/if_ed_pci.c
+++ b/sys/dev/ed/if_ed_pci.c
@@ -17,7 +17,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: if_ed_p.c,v 1.14 1998/12/14 05:47:27 dillon Exp $
+ *	$Id: if_ed_p.c,v 1.15 1999/04/24 20:14:00 peter Exp $
  */
 
 #include "pci.h"
@@ -64,11 +64,7 @@ static struct pci_device ed_pci_driver = {
 	NULL
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (ed_pci, ed_pci_driver);
-#else
-DATA_SET (pcidevice_set, ed_pci_driver);
-#endif /* COMPAT_PCI_DRIVER */
 
 static const char*
 ed_pci_probe (pcici_t tag, pcidi_t type)
diff --git a/sys/dev/en/if_en_pci.c b/sys/dev/en/if_en_pci.c
index 39d5d79fbda1..cb35267e5402 100644
--- a/sys/dev/en/if_en_pci.c
+++ b/sys/dev/en/if_en_pci.c
@@ -114,11 +114,7 @@ static struct pci_device endevice = {
 	NULL,
 };  
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (en, endevice);
-#else
-DATA_SET (pcidevice_set, endevice);
-#endif /* COMPAT_PCI_DRIVER */
 
 /*
  * local defines (PCI specific stuff)
diff --git a/sys/dev/hea/eni.c b/sys/dev/hea/eni.c
index aea0dacd0f3d..0c423bcc7593 100644
--- a/sys/dev/hea/eni.c
+++ b/sys/dev/hea/eni.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni.c,v 1.5 1998/12/14 06:37:01 dillon Exp $
+ *	@(#) $Id: eni.c,v 1.6 1999/04/24 20:17:05 peter Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef	lint
-__RCSID("@(#) $Id: eni.c,v 1.5 1998/12/14 06:37:01 dillon Exp $");
+__RCSID("@(#) $Id: eni.c,v 1.6 1999/04/24 20:17:05 peter Exp $");
 #endif
 
 /*
@@ -80,11 +80,7 @@ static struct pci_device eni_pci_device = {
 #endif
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (eni_pci, eni_pci_device);
-#else
-DATA_SET ( pcidevice_set, eni_pci_device );
-#endif /* COMPAT_PCI_DRIVER */
 #endif	/* __FreeBSD__ */
 
 /*
diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c
index bb5744bbf3d9..10a35bccecbc 100644
--- a/sys/dev/hfa/fore_load.c
+++ b/sys/dev/hfa/fore_load.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_load.c,v 1.5 1998/12/14 06:37:37 dillon Exp $
+ *	@(#) $Id: fore_load.c,v 1.6 1999/04/24 20:17:05 peter Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_load.c,v 1.5 1998/12/14 06:37:37 dillon Exp $");
+__RCSID("@(#) $Id: fore_load.c,v 1.6 1999/04/24 20:17:05 peter Exp $");
 #endif
 
 
@@ -107,11 +107,7 @@ static struct pci_device fore_pci_device = {
 #endif
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER(fore_pci, fore_pci_device);
-#else
-DATA_SET(pcidevice_set, fore_pci_device);
-#endif /* COMPAT_PCI_DRIVER */
 #endif
 
 
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index b7ce04d79427..9f535504a62b 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -1,4 +1,4 @@
-/* $Id: isp_pci.c,v 1.19 1999/04/11 02:47:31 eivind Exp $ */
+/* $Id: isp_pci.c,v 1.20 1999/04/24 20:14:02 peter Exp $ */
 /* release_4_3_99 */
 /*
  * PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
@@ -271,11 +271,7 @@ static struct pci_device isp_pci_driver = {
 	&ispunit,
 	NULL
 };
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (isp_pci, isp_pci_driver);
-#else
-DATA_SET (pcidevice_set, isp_pci_driver);
-#endif /* COMPAT_PCI_DRIVER */
 
 
 static PROBETYPE
diff --git a/sys/dev/lnc/if_lnc_pci.c b/sys/dev/lnc/if_lnc_pci.c
index 271575139752..6b9605dab72b 100644
--- a/sys/dev/lnc/if_lnc_pci.c
+++ b/sys/dev/lnc/if_lnc_pci.c
@@ -17,7 +17,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: if_lnc_p.c,v 1.7 1998/12/14 06:32:55 dillon Exp $
+ *	$Id: if_lnc_p.c,v 1.8 1999/04/24 20:14:00 peter Exp $
  */
 
 #include "pci.h"
@@ -49,11 +49,7 @@ static struct pci_device lnc_pci_driver = {
 	NULL
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (lnc_pci, lnc_pci_driver);
-#else
-DATA_SET (pcidevice_set, lnc_pci_driver);
-#endif /* COMPAT_PCI_DRIVER */
 
 static const char*
 lnc_pci_probe (pcici_t tag, pcidi_t type)
diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c
index 10ef90c6eb99..839b93998f82 100644
--- a/sys/dev/pdq/if_fpa.c
+++ b/sys/dev/pdq/if_fpa.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_fpa.c,v 1.8 1998/12/14 06:32:55 dillon Exp $
+ * $Id: if_fpa.c,v 1.9 1999/04/24 20:14:00 peter Exp $
  *
  */
 
@@ -214,11 +214,7 @@ static struct pci_device fpadevice = {
     NULL
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (fpa, fpadevice);
-#else
-DATA_SET (pcidevice_set, fpadevice);
-#endif /* COMPAT_PCI_DRIVER */
 
 #elif defined(__bsdi__)
 
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c
index 410a857be0d2..1824841effb3 100644
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/rp.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rp.c,v 1.24 1999/04/27 11:15:12 phk Exp $
+ *	$Id: rp.c,v 1.25 1999/05/06 18:44:04 peter Exp $
  */
 
 /* 
@@ -782,11 +782,7 @@ static struct pci_device rp_pcidevice = {
 	NULL
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (rp_pci, rp_pcidevice);
-#else
-DATA_SET (pcidevice_set, rp_pcidevice);
-#endif /* COMPAT_PCI_DRIVER */
 
 static timeout_t rpdtrwakeup;
 
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 8cdef5c1d124..7a6c60d3a91b 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.83 1999/05/02 20:35:44 peter Exp $
+ *	$Id: si.c,v 1.84 1999/05/08 07:02:31 phk Exp $
  */
 
 #ifndef lint
@@ -149,11 +149,7 @@ static struct pci_device sipcidev = {
 	NULL,
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (sipci, sipcidev);
-#else
-DATA_SET (pcidevice_set, sipcidev);
-#endif /* COMPAT_PCI_DRIVER */
 
 #endif
 
diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c
index 466a639cd3fb..a7d34e9baada 100644
--- a/sys/dev/sr/if_sr_pci.c
+++ b/sys/dev/sr/if_sr_pci.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr_p.c,v 1.7 1998/12/14 06:32:56 dillon Exp $
+ * $Id: if_sr_p.c,v 1.8 1999/04/24 20:14:01 peter Exp $
  */
 
 #include "pci.h"
@@ -65,13 +65,10 @@ static struct pci_device sr_pci_driver =
 	sr_pci_probe,
 	sr_pci_attach,
 	&src_count,
-	NULL};
+	NULL
+};
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (sr_pci, sr_pci_driver);
-#else
-DATA_SET (pcidevice_set, sr_pci_driver);
-#endif /* COMPAT_PCI_DRIVER */
 
 static const char *
 sr_pci_probe(pcici_t tag, pcidi_t type)
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index 212f34546113..2e3e7664c0e5 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_ti.c,v 1.109 1999/04/29 16:22:07 wpaul Exp $
+ *	$Id: if_ti.c,v 1.4 1999/04/29 16:27:51 wpaul Exp $
  */
 
 /*
@@ -128,7 +128,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_ti.c,v 1.109 1999/04/29 16:22:07 wpaul Exp $";
+	"$Id: if_ti.c,v 1.4 1999/04/29 16:27:51 wpaul Exp $";
 #endif
 
 /*
@@ -2483,8 +2483,4 @@ static struct pci_device ti_device = {
 	&ti_count,
 	NULL
 };
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER(ti, ti_device);
-#else
-DATA_SET(pcidevice_set, ti_device);
-#endif /* COMPAT_PCI_DRIVER */
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index 63d62efd0d36..db5d268b1ab4 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/*	$Id: if_tx.c,v 1.24 1999/04/17 08:36:07 peter Exp $ */
+/*	$Id: if_tx.c,v 1.25 1999/04/24 20:14:01 peter Exp $ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
@@ -389,14 +389,11 @@ static struct pci_device txdevice = {
 	epic_freebsd_probe,
 	epic_freebsd_attach,
 	&epic_pci_count,
-	NULL };
+	NULL
+};
 
 /* Append this driver to pci drivers list */
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (tx, txdevice);
-#else
-DATA_SET ( pcidevice_set, txdevice );
-#endif /* COMPAT_PCI_DRIVER */
 
 /* Synopsis: Check if device id corresponds with SMC83C170 id.  */
 static const char*
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index a88c6c64c855..725a9ee30936 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_vr.c,v 1.9 1999/02/23 15:38:24 wpaul Exp $
+ *	$Id: if_vr.c,v 1.10 1999/04/24 20:14:01 peter Exp $
  */
 
 /*
@@ -97,7 +97,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_vr.c,v 1.9 1999/02/23 15:38:24 wpaul Exp $";
+	"$Id: if_vr.c,v 1.10 1999/04/24 20:14:01 peter Exp $";
 #endif
 
 /*
@@ -1959,8 +1959,4 @@ static struct pci_device vr_device = {
 	&vr_count,
 	NULL
 };
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER(vr, vr_device);
-#else
-DATA_SET(pcidevice_set, vr_device);
-#endif /* COMPAT_PCI_DRIVER */
diff --git a/sys/dev/vx/if_vx_pci.c b/sys/dev/vx/if_vx_pci.c
index 2c629bf67b8f..99cf2792ffaa 100644
--- a/sys/dev/vx/if_vx_pci.c
+++ b/sys/dev/vx/if_vx_pci.c
@@ -137,11 +137,7 @@ static struct pci_device vxdevice = {
     NULL
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (vx, vxdevice);
-#else
-DATA_SET (pcidevice_set, vxdevice);
-#endif /* COMPAT_PCI_DRIVER */
 
 #endif	/* NVX */
 #endif	/* NPCI */