From 3c43b8e66c7d378c08f5144a7f15cd821b7d9b0a Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 1 Nov 2012 17:25:27 -0700 Subject: [PATCH] --- yaml --- r: 337599 b: refs/heads/master c: 4ee6d2743a7a8fc4a7ce770cd5b9296e70552edf h: refs/heads/master i: 337597: 2a3fb0a067f0d48ece83254304ec6504dbe9a3df 337595: be69131b06d88629a3615036577023fb653c8be4 337591: 6f5f7b8ceb5ec354fe4848ba1b76b7b091692d2d 337583: d1a13905b42dbac8550aeef4e70f25298b80c49d 337567: 91b09e0bbe5c3e92f077ed009a7fbab56fcb8436 337535: 858a7d952762019fc7c1d2d2df5b116b3da895d8 v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/addi_apci_3120.c | 17 +---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 637e6fefe3f7..24daf9b658ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 887f706edf86fe90d04f0df83704d612722e3d36 +refs/heads/master: 4ee6d2743a7a8fc4a7ce770cd5b9296e70552edf diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c b/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c index 3acc595497e4..d405b3bf8737 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c +++ b/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c @@ -331,22 +331,7 @@ static int apci3120_attach_pci(struct comedi_device *dev, /* Allocate and Initialise TTL */ s = &dev->subdevices[5]; - if (this_board->i_NbrTTLChannel) { - s->type = COMEDI_SUBD_TTLIO; - s->subdev_flags = - SDF_WRITEABLE | SDF_READABLE | SDF_GROUND | SDF_COMMON; - s->n_chan = this_board->i_NbrTTLChannel; - s->maxdata = 1; - s->io_bits = 0; /* all bits input */ - s->len_chanlist = this_board->i_NbrTTLChannel; - s->range_table = &range_digital; - s->insn_config = this_board->ttl_config; - s->insn_bits = this_board->ttl_bits; - s->insn_read = this_board->ttl_read; - s->insn_write = this_board->ttl_write; - } else { - s->type = COMEDI_SUBD_UNUSED; - } + s->type = COMEDI_SUBD_UNUSED; /* EEPROM */ s = &dev->subdevices[6];