diff --git a/[refs] b/[refs] index f1330a8ff8a4..169863a9237c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3ab476bee2c4b038ca9c8e3a2c2fd79f7403749 +refs/heads/master: 49cd97b9beef15f7e946b659d45820f8812a3fe1 diff --git a/trunk/drivers/staging/comedi/drivers/contec_pci_dio.c b/trunk/drivers/staging/comedi/drivers/contec_pci_dio.c index 5578c2ca2998..944cfeeb2b2d 100644 --- a/trunk/drivers/staging/comedi/drivers/contec_pci_dio.c +++ b/trunk/drivers/staging/comedi/drivers/contec_pci_dio.c @@ -57,12 +57,6 @@ static const struct contec_board contec_boards[] = { #define thisboard ((const struct contec_board *)dev->board_ptr) -struct contec_private { - int data; -}; - -#define devpriv ((struct contec_private *)dev->private) - static int contec_do_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) @@ -130,9 +124,6 @@ static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it) dev->board_name = thisboard->name; - if (alloc_private(dev, sizeof(struct contec_private)) < 0) - return -ENOMEM; - ret = comedi_alloc_subdevices(dev, 2); if (ret) return ret;