From f803607245efeb035e393cbc44281d23028735a0 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 23 Jan 2013 12:36:14 -0700 Subject: [PATCH] --- yaml --- r: 354152 b: refs/heads/master c: 2a836ad74274e27b79e531f3399b8fc4220ea69d h: refs/heads/master v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/addi_apci_3501.c | 21 +------------------ 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/[refs] b/[refs] index d88145c57ec5..93619901bc61 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8861b456b8f800208e043b2d0d65985eca538dd9 +refs/heads/master: 2a836ad74274e27b79e531f3399b8fc4220ea69d diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_3501.c b/trunk/drivers/staging/comedi/drivers/addi_apci_3501.c index e2ea54267aab..772f03562e01 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_3501.c +++ b/trunk/drivers/staging/comedi/drivers/addi_apci_3501.c @@ -4,10 +4,6 @@ #include "addi-data/addi_common.h" -#ifndef COMEDI_SUBD_TTLIO -#define COMEDI_SUBD_TTLIO 11 /* Digital Input Output But TTL */ -#endif - #include "addi-data/addi_eeprom.c" #include "addi-data/hwdrv_apci3501.c" @@ -291,22 +287,7 @@ static int apci3501_auto_attach(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];