diff --git a/[refs] b/[refs] index adef847aacf8..d3fb85b3af49 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6bdae560f46cddc8aeff5bd9c76454168ee8e8ab +refs/heads/master: 423e0e3f551212df86d4e06287d253c2ae26e8dd diff --git a/trunk/drivers/staging/comedi/drivers/dyna_pci10xx.c b/trunk/drivers/staging/comedi/drivers/dyna_pci10xx.c index 82002c4ff132..24c5cd270ceb 100644 --- a/trunk/drivers/staging/comedi/drivers/dyna_pci10xx.c +++ b/trunk/drivers/staging/comedi/drivers/dyna_pci10xx.c @@ -101,7 +101,6 @@ static const struct boardtype boardtypes[] = { struct dyna_pci10xx_private { struct pci_dev *pci_dev; /* ptr to PCI device */ - char valid; /* card is usable */ struct mutex mutex; /* device base address registers */ @@ -342,8 +341,6 @@ static int dyna_pci10xx_attach(struct comedi_device *dev, s->state = 0; s->insn_bits = dyna_pci10xx_do_insn_bits; - devpriv->valid = 1; - printk(KERN_INFO "comedi: dyna_pci10xx: %s - device setup completed!\n", thisboard->name);