From 41b420910c7daa4b3ef5861f2a9fc1bdea90e9d6 Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Sun, 9 May 1999 17:07:30 +0000
Subject: Simplify the COMPAT_PCI_DRIVER/DATA_SET hack.  We can add: #define
 COMPAT_PCI_DRIVER(name,data) DATA_SET(pcidevice_set,data) .. to 2.2.x and 3.x
 if people think it's worth it.  Driver writers can do this if it's not
 defined.  (The reason for this is that I'm trying to progressively eliminate
 use of linker_sets where it hurts modularity and runtime load capability, and
 these DATA_SET's keep getting in the way.)

---
 sys/dev/sr/if_sr_pci.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'sys/dev/sr')

diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c
index 466a639..a7d34e9 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)
-- 
cgit v1.1