Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325191
b: refs/heads/master
c: efac035
h: refs/heads/master
i:
  325189: 15ea8eb
  325187: 1a4e3f8
  325183: 7d653ab
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 11, 2012
1 parent af29145 commit 65392f3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 68b82e0954c3a80b230722f5315f7d41eca3d0a2
refs/heads/master: efac035ca6eaaf6ca353e730055022cdf03ae7bb
4 changes: 1 addition & 3 deletions trunk/drivers/staging/comedi/drivers/icp_multi.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ struct boardtype {
int iorange; /* I/O range len */
char have_irq; /* 1=card support IRQ */
char cardtype; /* 0=ICP Multi */
int ai_maxdata; /* resolution of A/D */
const struct comedi_lrange *rangelist_ai; /* rangelist for A/D */
const char *rangecode; /* range codes for programming */
const struct comedi_lrange *rangelist_ao; /* rangelist for D/A */
Expand Down Expand Up @@ -804,7 +803,7 @@ static int icp_multi_attach(struct comedi_device *dev,
s->type = COMEDI_SUBD_AI;
s->subdev_flags = SDF_READABLE | SDF_COMMON | SDF_GROUND | SDF_DIFF;
s->n_chan = 16;
s->maxdata = this_board->ai_maxdata;
s->maxdata = 0x0fff;
s->len_chanlist = 16;
s->range_table = this_board->rangelist_ai;
s->insn_read = icp_multi_insn_read_ai;
Expand Down Expand Up @@ -882,7 +881,6 @@ static const struct boardtype boardtypes[] = {
.iorange = IORANGE_ICP_MULTI,
.have_irq = 1,
.cardtype = TYPE_ICP_MULTI,
.ai_maxdata = 0x0fff,
.rangelist_ai = &range_analog,
.rangecode = range_codes_analog,
.rangelist_ao = &range_analog,
Expand Down

0 comments on commit 65392f3

Please sign in to comment.