Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / drivers / staging / comedi / drivers / ni_atmio.c

diff --git a/drivers/staging/comedi/drivers/ni_atmio.c b/drivers/staging/comedi/drivers/ni_atmio.c
index 0c5ff287dcef6451430bbed52eb24f11ce4b9842..301f154be8138a9cf6c23a8c182c3ed791922e0b 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_atmio.c
+++ b/drivers/staging/comedi/drivers/ni_atmio.c
@@ -300,7 +300,6 @@ static int ni_atmio_attach(struct comedi_device *dev,
                           struct comedi_devconfig *it)
 {
        const struct ni_board_struct *boardtype;
-       struct ni_private *devpriv;
        struct pnp_dev *isapnp_dev;
        int ret;
        unsigned long iobase;
@@ -310,7 +309,6 @@ static int ni_atmio_attach(struct comedi_device *dev,
        ret = ni_alloc_private(dev);
        if (ret)
                return ret;
-       devpriv = dev->private;
 
        iobase = it->options[0];
        irq = it->options[1];