32 files changed, 168 insertions, 41 deletions
diff --git a/sys/pci/adv_pci.c b/sys/pci/adv_pci.c
index dd81e88..27bfc0d 100644
--- a/sys/pci/adv_pci.c
+++ b/sys/pci/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.3 1998/12/14 06:32:54 dillon Exp $
+ *	$Id: adv_pci.c,v 1.4 1998/12/22 18:14:15 gibbs Exp $
  */
 
 #include <pci.h>
@@ -95,7 +95,11 @@ 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/pci/adw_pci.c b/sys/pci/adw_pci.c
index b65037b..6efed69 100644
--- a/sys/pci/adw_pci.c
+++ b/sys/pci/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.2 1998/12/07 21:58:45 archie Exp $
+ *	$Id: adw_pci.c,v 1.3 1998/12/14 06:32:54 dillon Exp $
  */
 
 #include <pci.h>
@@ -69,7 +69,11 @@ 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/pci/alpm.c b/sys/pci/alpm.c
index a38446c..ce6f08d 100644
--- a/sys/pci/alpm.c
+++ b/sys/pci/alpm.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: alpm.c,v 1.1 1999/02/13 17:51:46 nsouch Exp $
  *
  */
 
@@ -206,7 +206,11 @@ static struct	pci_device alpm_device = {
 	&alpm_count
 };
 
+#ifdef COMPAT_PCI_DRIVER
+COMPAT_PCI_DRIVER (alpm, alpm_device);
+#else
 DATA_SET (pcidevice_set, alpm_device);
+#endif /* COMPAT_PCI_DRIVER */
 
 static const char*
 alpm_pci_probe(pcici_t tag, pcidi_t type)
diff --git a/sys/pci/brooktree848.c b/sys/pci/brooktree848.c
index d255a9f..fbce1f4 100644
--- a/sys/pci/brooktree848.c
+++ b/sys/pci/brooktree848.c
@@ -1,4 +1,4 @@
-/* $Id: brooktree848.c,v 1.66 1999/02/11 10:22:30 roger Exp $ */
+/* $Id: brooktree848.c,v 1.67 1999/02/25 07:45:47 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 
@@ -488,7 +488,11 @@ 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/pci/cy_pci.c b/sys/pci/cy_pci.c
index 46a4f52..c4f3c89 100644
--- a/sys/pci/cy_pci.c
+++ b/sys/pci/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.10 1999/01/15 10:00:12 bde Exp $
+ *	$Id: cy_pci.c,v 1.11 1999/04/15 00:13:20 alex Exp $
  */
 
 /*
@@ -62,7 +62,11 @@ 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/pci/dpt_pci.c b/sys/pci/dpt_pci.c
index 7bf0e26..69ba362 100644
--- a/sys/pci/dpt_pci.c
+++ b/sys/pci/dpt_pci.c
@@ -32,7 +32,7 @@
  *  dptpci.c:  PCI Bus Attachment for DPT SCSI HBAs
  */
 
-#ident "$Id: dpt_pci.c,v 1.10 1998/12/07 21:58:46 archie Exp $"
+#ident "$Id: dpt_pci.c,v 1.11 1998/12/14 06:32:55 dillon Exp $"
 
 #include "opt_devfs.h"
 #include "opt_dpt.h"
@@ -78,7 +78,11 @@ 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/pci/es1370.c b/sys/pci/es1370.c
index 7277e7a..a2897ff 100644
--- a/sys/pci/es1370.c
+++ b/sys/pci/es1370.c
@@ -36,7 +36,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: es1370.c,v 1.1 1998/12/31 08:14:27 luigi Exp $
  */
 
 #include "pci.h"
@@ -153,7 +153,11 @@ static struct pci_device es_pci_driver = {
 	NULL
 };
 
+#ifdef COMPAT_PCI_DRIVER
+COMPAT_PCI_DRIVER(es_pci, es_pci_driver);
+#else
 DATA_SET(pcidevice_set, es_pci_driver);
+#endif /* COMPAT_PCI_DRIVER */
 
 static snddev_info es_op_desc = {
 	"ENSONIQ AudioPCI",
diff --git a/sys/pci/ide_pci.c b/sys/pci/ide_pci.c
index 6faef01..81fc318 100644
--- a/sys/pci/ide_pci.c
+++ b/sys/pci/ide_pci.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ide_pci.c,v 1.31 1999/04/13 20:22:33 peter Exp $
+ *	$Id: ide_pci.c,v 1.32 1999/04/16 21:22:50 peter Exp $
  */
 
 #include "pci.h"
@@ -1672,7 +1672,11 @@ static struct pci_device ide_pci_device = {
 	0
 };
 
+#ifdef COMPAT_PCI_DRIVER
+COMPAT_PCI_DRIVER(ide_pci, ide_pci_device);
+#else
 DATA_SET(pcidevice_set, ide_pci_device);
+#endif /* COMPAT_PCI_DRIVER */
 
 /*
  * Return a cookie if we may be able to do DMA on the specified
diff --git a/sys/pci/if_ax.c b/sys/pci/if_ax.c
index 865f776..5f33bc1 100644
--- a/sys/pci/if_ax.c
+++ b/sys/pci/if_ax.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_ax.c,v 1.10 1999/04/08 03:57:57 wpaul Exp $
+ *	$Id: if_ax.c,v 1.7 1999/04/08 17:42:47 wpaul Exp $
  */
 
 /*
@@ -87,7 +87,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_ax.c,v 1.10 1999/04/08 03:57:57 wpaul Exp $";
+	"$Id: if_ax.c,v 1.7 1999/04/08 17:42:47 wpaul Exp $";
 #endif
 
 /*
@@ -2238,4 +2238,8 @@ static struct pci_device ax_device = {
 	&ax_count,
 	NULL
 };
+#ifdef COMPAT_PCI_DRIVER
+COMPAT_PCI_DRIVER(ax, ax_device);
+#else
 DATA_SET(pcidevice_set, ax_device);
+#endif /* COMPAT_PCI_DRIVER */
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index d9c52f7..045d75a 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/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.101 1999/03/14 08:32:52 peter Exp $ */
+/*	$Id: if_de.c,v 1.102 1999/03/17 16:44:52 luigi Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -5378,7 +5378,11 @@ 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/pci/if_ed_p.c b/sys/pci/if_ed_p.c
index e14a96c..ee47d80 100644
--- a/sys/pci/if_ed_p.c
+++ b/sys/pci/if_ed_p.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.13 1998/03/17 10:54:23 danny Exp $
+ *	$Id: if_ed_p.c,v 1.14 1998/12/14 05:47:27 dillon Exp $
  */
 
 #include "pci.h"
@@ -64,7 +64,11 @@ 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/pci/if_en_pci.c b/sys/pci/if_en_pci.c
index 3414edc..39d5d79 100644
--- a/sys/pci/if_en_pci.c
+++ b/sys/pci/if_en_pci.c
@@ -114,7 +114,11 @@ 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/pci/if_fpa.c b/sys/pci/if_fpa.c
index cff0be2..10ef90c 100644
--- a/sys/pci/if_fpa.c
+++ b/sys/pci/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.7 1998/02/20 13:11:53 bde Exp $
+ * $Id: if_fpa.c,v 1.8 1998/12/14 06:32:55 dillon Exp $
  *
  */
 
@@ -214,9 +214,12 @@ static struct pci_device fpadevice = {
     NULL
 };
 
-#ifdef DATA_SET
+#ifdef COMPAT_PCI_DRIVER
+COMPAT_PCI_DRIVER (fpa, fpadevice);
+#else
 DATA_SET (pcidevice_set, fpadevice);
-#endif
+#endif /* COMPAT_PCI_DRIVER */
+
 #elif defined(__bsdi__)
 
 static int
diff --git a/sys/pci/if_lnc_p.c b/sys/pci/if_lnc_p.c
index 27f2048..2715751 100644
--- a/sys/pci/if_lnc_p.c
+++ b/sys/pci/if_lnc_p.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.6 1998/07/20 17:33:01 msmith Exp $
+ *	$Id: if_lnc_p.c,v 1.7 1998/12/14 06:32:55 dillon Exp $
  */
 
 #include "pci.h"
@@ -49,7 +49,11 @@ 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/pci/if_mx.c b/sys/pci/if_mx.c
index 9795c70..f3abc5a 100644
--- a/sys/pci/if_mx.c
+++ b/sys/pci/if_mx.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_mx.c,v 1.13 1999/04/08 17:38:05 wpaul Exp $
+ *	$Id: if_mx.c,v 1.14 1999/04/16 01:56:06 ghelmer Exp $
  */
 
 /*
@@ -99,7 +99,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_mx.c,v 1.13 1999/04/08 17:38:05 wpaul Exp $";
+	"$Id: if_mx.c,v 1.14 1999/04/16 01:56:06 ghelmer Exp $";
 #endif
 
 /*
@@ -2513,4 +2513,8 @@ static struct pci_device mx_device = {
 	&mx_count,
 	NULL
 };
+#ifdef COMPAT_PCI_DRIVER
+COMPAT_PCI_DRIVER(mx, mx_device);
+#else
 DATA_SET(pcidevice_set, mx_device);
+#endif /* COMPAT_PCI_DRIVER */
diff --git a/sys/pci/if_pn.c b/sys/pci/if_pn.c
index 3209051..4f58759 100644
--- a/sys/pci/if_pn.c
+++ b/sys/pci/if_pn.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_pn.c,v 1.16 1999/04/14 19:40:07 wpaul Exp $
+ *	$Id: if_pn.c,v 1.17 1999/04/16 21:22:51 peter Exp $
  */
 
 /*
@@ -97,7 +97,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_pn.c,v 1.16 1999/04/14 19:40:07 wpaul Exp $";
+	"$Id: if_pn.c,v 1.17 1999/04/16 21:22:51 peter Exp $";
 #endif
 
 #ifdef __alpha__
@@ -2282,4 +2282,8 @@ static struct pci_device pn_device = {
 	&pn_count,
 	NULL
 };
+#ifdef COMPAT_PCI_DRIVER
+COMPAT_PCI_DRIVER(pn, pn_device);
+#else
 DATA_SET(pcidevice_set, pn_device);
+#endif /* COMPAT_PCI_DRIVER */
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 6a81f1e..5a5d334 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.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_rl.c,v 1.30 1999/04/12 21:32:17 wpaul Exp $
+ *	$Id: if_rl.c,v 1.13 1999/04/12 21:37:00 wpaul Exp $
  */
 
 /*
@@ -127,7 +127,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_rl.c,v 1.30 1999/04/12 21:32:17 wpaul Exp $";
+	"$Id: if_rl.c,v 1.13 1999/04/12 21:37:00 wpaul Exp $";
 #endif
 
 /*
@@ -1914,4 +1914,8 @@ static struct pci_device rl_device = {
 	&rl_count,
 	NULL
 };
+#ifdef COMPAT_PCI_DRIVER
+COMPAT_PCI_DRIVER(rl, rl_device);
+#else
 DATA_SET(pcidevice_set, rl_device);
+#endif /* COMPAT_PCI_DRIVER */
diff --git a/sys/pci/if_sr_p.c b/sys/pci/if_sr_p.c
index 41a5ec3..466a639 100644
--- a/sys/pci/if_sr_p.c
+++ b/sys/pci/if_sr_p.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.6 1998/02/09 06:10:52 eivind Exp $
+ * $Id: if_sr_p.c,v 1.7 1998/12/14 06:32:56 dillon Exp $
  */
 
 #include "pci.h"
@@ -67,7 +67,11 @@ static struct pci_device sr_pci_driver =
 	&src_count,
 	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/pci/if_ti.c b/sys/pci/if_ti.c
index befff6f..297cbc0 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/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.1 1999/04/06 17:08:29 wpaul Exp $
+ *	$Id: if_ti.c,v 1.2 1999/04/06 22:56:21 wpaul Exp $
  */
 
 /*
@@ -128,7 +128,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_ti.c,v 1.1 1999/04/06 17:08:29 wpaul Exp $";
+	"$Id: if_ti.c,v 1.2 1999/04/06 22:56:21 wpaul Exp $";
 #endif
 
 /*
@@ -2480,4 +2480,8 @@ 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/pci/if_tl.c b/sys/pci/if_tl.c
index a2e8437..16446fd 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.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_tl.c,v 1.38 1999/03/31 04:00:05 wpaul Exp $
+ *	$Id: if_tl.c,v 1.28 1999/03/31 04:04:14 wpaul Exp $
  */
 
 /*
@@ -221,7 +221,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_tl.c,v 1.38 1999/03/31 04:00:05 wpaul Exp $";
+	"$Id: if_tl.c,v 1.28 1999/03/31 04:04:14 wpaul Exp $";
 #endif
 
 /*
@@ -2830,4 +2830,8 @@ static struct pci_device tl_device = {
 	&tl_count,
 	NULL
 };
+#ifdef COMPAT_PCI_DRIVER
+COMPAT_PCI_DRIVER(tl, tl_device);
+#else
 DATA_SET(pcidevice_set, tl_device);
+#endif /* COMPAT_PCI_DRIVER */
diff --git a/sys/pci/if_tx.c b/sys/pci/if_tx.c
index b58e44e..63d62ef 100644
--- a/sys/pci/if_tx.c
+++ b/sys/pci/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.23 1999/03/31 13:50:52 nsayer Exp $ */
+/*	$Id: if_tx.c,v 1.24 1999/04/17 08:36:07 peter Exp $ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
@@ -392,7 +392,11 @@ static struct pci_device txdevice = {
 	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/pci/if_vr.c b/sys/pci/if_vr.c
index 7c4c1d8..a88c6c6 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/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.18 1999/02/23 06:47:52 wpaul Exp $
+ *	$Id: if_vr.c,v 1.9 1999/02/23 15:38:24 wpaul Exp $
  */
 
 /*
@@ -97,7 +97,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_vr.c,v 1.18 1999/02/23 06:47:52 wpaul Exp $";
+	"$Id: if_vr.c,v 1.9 1999/02/23 15:38:24 wpaul Exp $";
 #endif
 
 /*
@@ -1959,4 +1959,8 @@ 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/pci/if_vx_pci.c b/sys/pci/if_vx_pci.c
index ab02693..2c629bf 100644
--- a/sys/pci/if_vx_pci.c
+++ b/sys/pci/if_vx_pci.c
@@ -137,7 +137,11 @@ 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 */
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index eadfffb..02017ca 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.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_wb.c,v 1.6 1999/01/16 06:25:58 wpaul Exp $
+ *	$Id: if_wb.c,v 1.7 1999/02/01 21:25:52 wpaul Exp $
  */
 
 /*
@@ -121,7 +121,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_wb.c,v 1.6 1999/01/16 06:25:58 wpaul Exp $";
+	"$Id: if_wb.c,v 1.7 1999/02/01 21:25:52 wpaul Exp $";
 #endif
 
 /*
@@ -2149,4 +2149,8 @@ static struct pci_device wb_device = {
 	&wb_count,
 	NULL
 };
+#ifdef COMPAT_PCI_DRIVER
+COMPAT_PCI_DRIVER(wb, wb_device);
+#else
 DATA_SET(pcidevice_set, wb_device);
+#endif /* COMPAT_PCI_DRIVER */
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index e848418..4ef2d3e 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.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_xl.c,v 1.31 1999/04/16 01:56:06 ghelmer Exp $
+ *	$Id: if_xl.c,v 1.32 1999/04/16 21:22:51 peter Exp $
  */
 
 /*
@@ -164,7 +164,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_xl.c,v 1.31 1999/04/16 01:56:06 ghelmer Exp $";
+	"$Id: if_xl.c,v 1.32 1999/04/16 21:22:51 peter Exp $";
 #endif
 
 /*
@@ -2887,4 +2887,8 @@ static struct pci_device xl_device = {
 	&xl_count,
 	NULL
 };
+#ifdef COMPAT_PCI_DRIVER
+COMPAT_PCI_DRIVER(xl, xl_device);
+#else
 DATA_SET(pcidevice_set, xl_device);
+#endif /* COMPAT_PCI_DRIVER */
diff --git a/sys/pci/intpm.c b/sys/pci/intpm.c
index a07d752..b811479 100644
--- a/sys/pci/intpm.c
+++ b/sys/pci/intpm.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: intpm.c,v 1.4 1999/01/28 00:57:53 dillon Exp $
+ *	$Id: intpm.c,v 1.5 1999/04/21 07:26:29 peter Exp $
  */
 
 #include "pci.h"
@@ -150,7 +150,11 @@ static struct	pci_device intpm_device = {
 	&intpm_count
 };
 
+#ifdef COMPAT_PCI_DRIVER
+COMPAT_PCI_DRIVER (intpm, intpm_device);
+#else
 DATA_SET (pcidevice_set, intpm_device);
+#endif /* COMPAT_PCI_DRIVER */
 
 static int 
 intsmb_probe(device_t dev)
diff --git a/sys/pci/isp_pci.c b/sys/pci/isp_pci.c
index ee3eba9..b7ce04d 100644
--- a/sys/pci/isp_pci.c
+++ b/sys/pci/isp_pci.c
@@ -1,4 +1,4 @@
-/* $Id: isp_pci.c,v 1.18 1999/04/04 01:14:02 mjacob Exp $ */
+/* $Id: isp_pci.c,v 1.19 1999/04/11 02:47:31 eivind Exp $ */
 /* release_4_3_99 */
 /*
  * PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
@@ -271,7 +271,11 @@ 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/pci/meteor.c b/sys/pci/meteor.c
index 7f0fcf6..949c497 100644
--- a/sys/pci/meteor.c
+++ b/sys/pci/meteor.c
@@ -208,7 +208,11 @@ static struct	pci_device met_device = {
 	&met_count
 };
 
+#ifdef COMPAT_PCI_DRIVER
+COMPAT_PCI_DRIVER (meteor, met_device);
+#else
 DATA_SET (pcidevice_set, met_device);
+#endif /* COMPAT_PCI_DRIVER */
 
 #if defined(METEOR_FreeBSD_210)	/* XXX */
 d_open_t	meteor_open;
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index 16e7bf6..a32e14a 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: ncr.c,v 1.141 1998/12/30 00:37:44 hoek Exp $
+**  $Id: ncr.c,v 1.142 1999/01/27 23:45:43 dillon Exp $
 **
 **  Device driver for the   NCR 53C8XX   PCI-SCSI-Controller Family.
 **
@@ -1361,7 +1361,7 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 #if !defined(lint)
 static const char ident[] =
-	"\n$Id: ncr.c,v 1.141 1998/12/30 00:37:44 hoek Exp $\n";
+	"\n$Id: ncr.c,v 1.142 1999/01/27 23:45:43 dillon Exp $\n";
 #endif
 
 static const u_long	ncr_version = NCR_VERSION	* 11
@@ -1410,7 +1410,11 @@ static struct	pci_device ncr_device = {
 	NULL
 };
 
+#ifdef COMPAT_PCI_DRIVER
+COMPAT_PCI_DRIVER (ncr, ncr_device);
+#else
 DATA_SET (pcidevice_set, ncr_device);
+#endif /* COMPAT_PCI_DRIVER */
 
 static char *ncr_name (ncb_p np)
 {
diff --git a/sys/pci/pcic_p.c b/sys/pci/pcic_p.c
index a97588c..d9acf4f 100644
--- a/sys/pci/pcic_p.c
+++ b/sys/pci/pcic_p.c
@@ -26,7 +26,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: pcic_p.c,v 1.8 1999/01/25 12:59:31 torstenb Exp $
+ * $Id: pcic_p.c,v 1.9 1999/04/01 15:28:09 nsayer Exp $
  */
 
 #include "pci.h"
@@ -57,7 +57,11 @@ static struct pci_device pcic_pci_driver = {
 	NULL
 };
 
+#ifdef COMPAT_PCI_DRIVER
+COMPAT_PCI_DRIVER(pcic_pci, pcic_pci_driver);
+#else
 DATA_SET(pcidevice_set, pcic_pci_driver);
+#endif /* COMPAT_PCI_DRIVER */
 
 /*
  * Return the ID string for the controller if the vendor/product id
diff --git a/sys/pci/simos.c b/sys/pci/simos.c
index 85642b8..d833beb 100644
--- a/sys/pci/simos.c
+++ b/sys/pci/simos.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: simos.c,v 1.2 1998/09/26 14:49:26 dfr Exp $
+ *	$Id: simos.c,v 1.3 1998/12/14 06:32:57 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -82,7 +82,11 @@ struct pci_device simos_driver = {
 	&simos_unit,
 	NULL
 };
+#ifdef COMPAT_PCI_DRIVER
+COMPAT_PCI_DRIVER (simos, simos_driver);
+#else
 DATA_SET (pcidevice_set, simos_driver);
+#endif /* COMPAT_PCI_DRIVER */
 
 static const char *
 simos_probe(pcici_t tag, pcidi_t type)
diff --git a/sys/pci/xrpu.c b/sys/pci/xrpu.c
index df2969d..b1a1dda 100644
--- a/sys/pci/xrpu.c
+++ b/sys/pci/xrpu.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: xrpu.c,v 1.7 1999/03/11 15:09:50 phk Exp $
+ * $Id: xrpu.c,v 1.8 1999/03/12 11:09:18 phk Exp $
  *
  * A very simple device driver for PCI cards based on Xilinx 6200 series
  * FPGA/RPU devices.  Current Functionality is to allow you to open and
@@ -198,7 +198,11 @@ static struct pci_device xrpu_device = {
 	NULL
 };
 
+#ifdef COMPAT_PCI_DRIVER
+COMPAT_PCI_DRIVER (xrpu, xrpu_device);
+#else
 DATA_SET (pcidevice_set, xrpu_device);
+#endif /* COMPAT_PCI_DRIVER */
 
 static const char* 
 xrpu_probe (pcici_t tag, pcidi_t typea)