From 579f45fa601b342ea72b6bfbb3190cf80f376bea Mon Sep 17 00:00:00 2001 From: Peter Wemm 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/contrib/dev/oltr/if_oltr.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'sys/contrib/dev/oltr') diff --git a/sys/contrib/dev/oltr/if_oltr.c b/sys/contrib/dev/oltr/if_oltr.c index 902250f4a913..268ad8a80204 100644 --- a/sys/contrib/dev/oltr/if_oltr.c +++ b/sys/contrib/dev/oltr/if_oltr.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_oltr.c,v 1.3 1999/04/21 07:02:19 peter Exp $ + * $Id: if_oltr.c,v 1.4 1999/04/24 20:24:02 peter Exp $ */ @@ -259,11 +259,7 @@ static struct pci_device oltr_device = { NULL }; -#ifndef COMPAT_PCI_DRIVER -DATA_SET(pcidevice_set, oltr_device); -#else COMPAT_PCI_DRIVER(oltr_pci, oltr_device); -#endif /* COMPAT_PCI_DRIVER */ int pci_cards = 0; #endif /* NPCI */ -- cgit v1.3