diff --git a/[refs] b/[refs] index 6506502c3d36..7762f71e9144 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70a6001aeffeaa12f2a1c21470e8f3bdfb6ef8e7 +refs/heads/master: 9335f2613b6beca0f3f3e20ce5a550d1ffe66aa2 diff --git a/trunk/drivers/staging/comedi/drivers/rti800.c b/trunk/drivers/staging/comedi/drivers/rti800.c index bd579711a519..594c5e82211f 100644 --- a/trunk/drivers/staging/comedi/drivers/rti800.c +++ b/trunk/drivers/staging/comedi/drivers/rti800.c @@ -145,7 +145,7 @@ COMEDI_INITCLEANUP(driver_rti800); static irqreturn_t rti800_interrupt(int irq, void *dev PT_REGS_ARG); -typedef struct { +struct rti800_private { enum { adc_diff, adc_pseudodiff, adc_singleended } adc_mux; @@ -164,9 +164,9 @@ typedef struct { const struct comedi_lrange *ao_range_type_list[2]; unsigned int ao_readback[2]; int muxgain_bits; -} rti800_private; +}; -#define devpriv ((rti800_private *)dev->private) +#define devpriv ((struct rti800_private *)dev->private) #define RTI800_TIMEOUT 100 @@ -351,7 +351,7 @@ static int rti800_attach(struct comedi_device * dev, struct comedi_devconfig * i if ((ret = alloc_subdevices(dev, 4)) < 0) return ret; - if ((ret = alloc_private(dev, sizeof(rti800_private))) < 0) + if ((ret = alloc_private(dev, sizeof(struct rti800_private))) < 0) return ret; devpriv->adc_mux = it->options[2];