From bd50427e1dda00e0cd492f082db54c5528717f3b Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 23 Jan 2013 12:44:17 -0700 Subject: [PATCH] --- yaml --- r: 354173 b: refs/heads/master c: 99c9fa48b6bbc640066c414d6b413a1f1b4aa857 h: refs/heads/master i: 354171: a2976cdbdaed7c42ae61d19316328eae2d13d36e v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/addi-data/hwdrv_apci3501.c | 8 -------- trunk/drivers/staging/comedi/drivers/addi_apci_3501.c | 9 ++++++++- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 6814d6526741..5ba32aede6d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53b28a23532f203f4b8287fad2461886088a9158 +refs/heads/master: 99c9fa48b6bbc640066c414d6b413a1f1b4aa857 diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c index bbdda4ec523c..9739e8b87bea 100644 --- a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c +++ b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c @@ -64,14 +64,6 @@ You should also find the complete GPL in the COPYING file accompanying this sour #define ADDIDATA_TIMER 0 #define ADDIDATA_WATCHDOG 2 -/* ANALOG OUTPUT RANGE */ -static struct comedi_lrange range_apci3501_ao = { - 2, { - BIP_RANGE(10), - UNI_RANGE(10) - } -}; - /* +----------------------------------------------------------------------------+ | Function Name : int i_APCI3501_ConfigAnalogOutput | diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_3501.c b/trunk/drivers/staging/comedi/drivers/addi_apci_3501.c index a7527a2fe4f0..b4679b24dd7b 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_3501.c +++ b/trunk/drivers/staging/comedi/drivers/addi_apci_3501.c @@ -40,6 +40,13 @@ struct apci3501_private { unsigned char b_InterruptMode; }; +static struct comedi_lrange apci3501_ao_range = { + 2, { + BIP_RANGE(10), + UNI_RANGE(10) + } +}; + #include "addi-data/hwdrv_apci3501.c" static int apci3501_di_insn_bits(struct comedi_device *dev, @@ -274,7 +281,7 @@ static int apci3501_auto_attach(struct comedi_device *dev, s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON; s->n_chan = ao_n_chan; s->maxdata = 0x3fff; - s->range_table = &range_apci3501_ao; + s->range_table = &apci3501_ao_range; s->insn_config = i_APCI3501_ConfigAnalogOutput; s->insn_write = i_APCI3501_WriteAnalogOutput; } else {