From 8fcbbfe4a35231cbc296b8ed179e362303ba1d21 Mon Sep 17 00:00:00 2001 From: Paul Richards Date: Fri, 29 Dec 2000 11:59:41 +0000 Subject: [PATCH] The pci and isa drivers were meant to share the same devclass but the devclass definitions were all wrong so they had their own private ones with the same name. Fix it so they all use the same global devclass. --- sys/dev/lnc/if_lnc.c | 2 ++ sys/dev/lnc/if_lnc_isa.c | 2 -- sys/dev/lnc/if_lnc_pci.c | 2 -- sys/dev/lnc/if_lncvar.h | 3 +++ 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c index 14445568eb8..05c3476def6 100644 --- a/sys/dev/lnc/if_lnc.c +++ b/sys/dev/lnc/if_lnc.c @@ -90,6 +90,8 @@ #include #include +devclass_t lnc_devclass; + static char const * const nic_ident[] = { "Unknown", "BICC", diff --git a/sys/dev/lnc/if_lnc_isa.c b/sys/dev/lnc/if_lnc_isa.c index ba84f3a7872..29dc39a8cab 100644 --- a/sys/dev/lnc/if_lnc_isa.c +++ b/sys/dev/lnc/if_lnc_isa.c @@ -310,6 +310,4 @@ static driver_t lnc_isa_driver = { sizeof(struct lnc_softc), }; -static devclass_t lnc_devclass; - DRIVER_MODULE(lnc_isa, isa, lnc_isa_driver, lnc_devclass, 0, 0); diff --git a/sys/dev/lnc/if_lnc_pci.c b/sys/dev/lnc/if_lnc_pci.c index 1e0d9403f2b..e5a84e7b150 100644 --- a/sys/dev/lnc/if_lnc_pci.c +++ b/sys/dev/lnc/if_lnc_pci.c @@ -217,6 +217,4 @@ static driver_t lnc_pci_driver = { sizeof(struct lnc_softc), }; -static devclass_t lnc_devclass; - DRIVER_MODULE(lnc_pci, pci, lnc_pci_driver, lnc_devclass, 0, 0); diff --git a/sys/dev/lnc/if_lncvar.h b/sys/dev/lnc/if_lncvar.h index 8c5035362ce..7c4ed70792b 100644 --- a/sys/dev/lnc/if_lncvar.h +++ b/sys/dev/lnc/if_lncvar.h @@ -253,4 +253,7 @@ struct host_ring_entry { /* Functional declarations */ extern int lnc_attach_common __P((device_t)); extern void lnc_stop __P((struct lnc_softc *)); + +/* Variable declarations */ extern driver_intr_t lncintr; +extern devclass_t lnc_devclass;