diff --git a/[refs] b/[refs] index b07913bcd81b..8387db5daa84 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41722460b70763eea69a76b4eb743b7295dfaa62 +refs/heads/master: 61f828ec59e949379ce9e00a99785c1d395bc9e0 diff --git a/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c b/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c index 9aca9dd57a2d..e0bdb70c9233 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c +++ b/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c @@ -83,25 +83,14 @@ static const struct dio24_board_struct dio24_boards[] = { }, }; -struct dio24_private { - - int data; /* number of data points left to be taken */ -}; - static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it) { const struct dio24_board_struct *thisboard = comedi_board(dev); - struct dio24_private *devpriv; struct comedi_subdevice *s; unsigned long iobase = 0; struct pcmcia_device *link; int ret; - devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); - if (!devpriv) - return -ENOMEM; - dev->private = devpriv; - /* get base address, irq etc. based on bustype */ switch (thisboard->bustype) { case pcmcia_bustype: