From 2dc6d34facc0953c59eee3a5d8e36d6edc0d8960 Mon Sep 17 00:00:00 2001 From: Roger Hardiman Date: Fri, 4 Jun 1999 13:24:54 +0000 Subject: Fix the cdevsw_add change made by PHK. (It was accidentally added to the BSDI bktr_probe and not the FreeBSD bktr_probe) --- sys/dev/bktr/bktr_core.c | 10 +++++----- sys/pci/brooktree848.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'sys') diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c index 558400becdb6..8deb185047a0 100644 --- a/sys/dev/bktr/bktr_core.c +++ b/sys/dev/bktr/bktr_core.c @@ -1,4 +1,4 @@ -/* $Id: brooktree848.c,v 1.82 1999/05/30 16:53:32 phk Exp $ */ +/* $Id: brooktree848.c,v 1.83 1999/05/31 11:28:53 phk Exp $ */ /* BT848 Driver for Brooktree's Bt848, Bt848A, Bt849A, Bt878, Bt879 based cards. The Brooktree BT848 Driver driver is based upon Mark Tinguely and Jim Lowe's driver for the Matrox Meteor PCI card . The @@ -668,10 +668,6 @@ bktr_probe(struct device *parent, struct cfdata *cf, void *aux) pci_devaddr_t *pa; pci_devres_t res; struct isa_attach_args *ia = aux; - static int once; - - if (!once++) - cdevsw_add(&bktr_cdevsw); if (ia->ia_bustype != BUS_PCI) return (0); @@ -1448,6 +1444,10 @@ static const char* bktr_probe( pcici_t tag, pcidi_t type ) { unsigned int rev = pci_conf_read( tag, PCIR_REVID) & 0x000000ff; + static int once; + + if (!once++) + cdevsw_add(&bktr_cdevsw); switch (type) { case BROOKTREE_848_PCI_ID: diff --git a/sys/pci/brooktree848.c b/sys/pci/brooktree848.c index 558400becdb6..8deb185047a0 100644 --- a/sys/pci/brooktree848.c +++ b/sys/pci/brooktree848.c @@ -1,4 +1,4 @@ -/* $Id: brooktree848.c,v 1.82 1999/05/30 16:53:32 phk Exp $ */ +/* $Id: brooktree848.c,v 1.83 1999/05/31 11:28:53 phk Exp $ */ /* BT848 Driver for Brooktree's Bt848, Bt848A, Bt849A, Bt878, Bt879 based cards. The Brooktree BT848 Driver driver is based upon Mark Tinguely and Jim Lowe's driver for the Matrox Meteor PCI card . The @@ -668,10 +668,6 @@ bktr_probe(struct device *parent, struct cfdata *cf, void *aux) pci_devaddr_t *pa; pci_devres_t res; struct isa_attach_args *ia = aux; - static int once; - - if (!once++) - cdevsw_add(&bktr_cdevsw); if (ia->ia_bustype != BUS_PCI) return (0); @@ -1448,6 +1444,10 @@ static const char* bktr_probe( pcici_t tag, pcidi_t type ) { unsigned int rev = pci_conf_read( tag, PCIR_REVID) & 0x000000ff; + static int once; + + if (!once++) + cdevsw_add(&bktr_cdevsw); switch (type) { case BROOKTREE_848_PCI_ID: -- cgit v1.3