diff --git a/[refs] b/[refs] index 8be43763be5e..0b7ce5627b87 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 222ab1bc78dd8a48576e904da37fd6f71cb41a7e +refs/heads/master: 450032a318ebfc95121fc548442217592803f4a7 diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c b/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c index 4c2e97302a35..1a580bd2247a 100644 --- a/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c +++ b/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c @@ -1065,7 +1065,8 @@ struct ext_clock_info { }; /* this structure is for data unique to this hardware driver. */ -typedef struct { +struct pcidas64_private { + struct pci_dev *hw_dev; // pointer to board's pci_dev struct // base addresses (physical) resource_size_t plx9080_phys_iobase; @@ -1109,12 +1110,13 @@ typedef struct { unsigned int ai_fifo_segment_length; struct ext_clock_info ext_clock; short ao_bounce_buffer[DAC_FIFO_SIZE]; -} pcidas64_private; +}; + /* inline function that makes it easier to * access the private structure. */ -static inline pcidas64_private *priv(struct comedi_device * dev) +static inline struct pcidas64_private *priv(struct comedi_device * dev) { return dev->private; } @@ -1685,7 +1687,7 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it) /* * Allocate the private structure area. */ - if (alloc_private(dev, sizeof(pcidas64_private)) < 0) + if (alloc_private(dev, sizeof(struct pcidas64_private)) < 0) return -ENOMEM; /*