From 61f3f8b869b53cd0fbedc3067c19c5464940282e Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 18 Jan 2013 10:42:35 -0700 Subject: [PATCH] --- yaml --- r: 354076 b: refs/heads/master c: a03953fbd896354e1f9a1e165d9c0c8a571a4a00 h: refs/heads/master v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/addi_apci_16xx.c | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 4a1a0d6c1d0a..34fa7c1dc915 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 243a55c57e9842c2a9fcc90018156dafb6642064 +refs/heads/master: a03953fbd896354e1f9a1e165d9c0c8a571a4a00 diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_16xx.c b/trunk/drivers/staging/comedi/drivers/addi_apci_16xx.c index 4812c90aa3c8..67f117a5ffe2 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_16xx.c +++ b/trunk/drivers/staging/comedi/drivers/addi_apci_16xx.c @@ -199,21 +199,7 @@ static int apci16xx_auto_attach(struct comedi_device *dev, /* Allocate and Initialise Timer Subdevice Structures */ s = &dev->subdevices[4]; - if (devpriv->s_EeParameters.i_Timer) { - s->type = COMEDI_SUBD_TIMER; - s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON; - s->n_chan = 1; - s->maxdata = 0; - s->len_chanlist = 1; - s->range_table = &range_digital; - - s->insn_write = this_board->timer_write; - s->insn_read = this_board->timer_read; - s->insn_config = this_board->timer_config; - s->insn_bits = this_board->timer_bits; - } else { - s->type = COMEDI_SUBD_UNUSED; - } + s->type = COMEDI_SUBD_UNUSED; /* Allocate and Initialise TTL */ s = &dev->subdevices[5];