summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroger <roger@FreeBSD.org>1999-04-30 11:16:30 +0000
committerroger <roger@FreeBSD.org>1999-04-30 11:16:30 +0000
commit309cae2b41c4829897b6587335d4110f809121ed (patch)
tree4a92a17e656890b357c00ef37069ef245745218a
parentf4069f36300ba80f95d4616434a23f67cd065d9c (diff)
downloadFreeBSD-src-309cae2b41c4829897b6587335d4110f809121ed.zip
FreeBSD-src-309cae2b41c4829897b6587335d4110f809121ed.tar.gz
My last commit accidentally undid the changes made in rev 1.68
regarding COMPAT_PCI_DRIVER. Put them back.
-rw-r--r--sys/dev/bktr/bktr_core.c6
-rw-r--r--sys/pci/brooktree848.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 1dbb0bb..cb5093f 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/* $Id: brooktree848.c,v 1.71 1999/04/29 09:57:47 roger Exp $ */
+/* $Id: brooktree848.c,v 1.72 1999/04/29 10:15:55 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,7 +527,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/brooktree848.c b/sys/pci/brooktree848.c
index 1dbb0bb..cb5093f 100644
--- a/sys/pci/brooktree848.c
+++ b/sys/pci/brooktree848.c
@@ -1,4 +1,4 @@
-/* $Id: brooktree848.c,v 1.71 1999/04/29 09:57:47 roger Exp $ */
+/* $Id: brooktree848.c,v 1.72 1999/04/29 10:15:55 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,7 +527,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;
OpenPOWER on IntegriCloud