Staging: comedi: jr3_pci.c: add required includes

[safe/jmp/linux-2.6] / drivers / staging / comedi / drivers / ni_670x.c

diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c
index c00bd0d..71f7d3a 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_670x.c
+++ b/drivers/staging/comedi/drivers/ni_670x.c
@@ -41,6 +41,7 @@ Commands are not supported.
 
 */
 
+#include <linux/interrupt.h>
 #include "../comedidev.h"
 
 #include "mite.h"
@@ -69,22 +70,22 @@ struct ni_670x_board {
 
 static const struct ni_670x_board ni_670x_boards[] = {
        {
-             dev_id:   0x2c90,
-             name:     "PCI-6703",
-             ao_chans:16,
-             ao_bits:  16,
+       .dev_id = 0x2c90,
+       .name = "PCI-6703",
+       .ao_chans = 16,
+       .ao_bits = 16,
                },
        {
-             dev_id:   0x1920,
-             name:     "PXI-6704",
-             ao_chans:32,
-             ao_bits:  16,
+       .dev_id = 0x1920,
+       .name = "PXI-6704",
+       .ao_chans = 32,
+       .ao_bits = 16,
                },
        {
-             dev_id:   0x1290,
-             name:     "PCI-6704",
-             ao_chans:32,
-             ao_bits:  16,
+       .dev_id = 0x1290,
+       .name = "PCI-6704",
+       .ao_chans = 32,
+       .ao_bits = 16,
                },
 };
 
@@ -115,10 +116,10 @@ static int ni_670x_attach(struct comedi_device *dev, struct comedi_devconfig *it
 static int ni_670x_detach(struct comedi_device *dev);
 
 static struct comedi_driver driver_ni_670x = {
-      driver_name:"ni_670x",
-      module:THIS_MODULE,
-      attach:ni_670x_attach,
-      detach:ni_670x_detach,
+       .driver_name = "ni_670x",
+       .module = THIS_MODULE,
+       .attach = ni_670x_attach,
+       .detach = ni_670x_detach,
 };
 
 COMEDI_PCI_INITCLEANUP(driver_ni_670x, ni_670x_pci_table);
@@ -144,7 +145,8 @@ static int ni_670x_attach(struct comedi_device *dev, struct comedi_devconfig *it
 
        printk("comedi%d: ni_670x: ", dev->minor);
 
-       if ((ret = alloc_private(dev, sizeof(struct ni_670x_private))) < 0)
+       ret = alloc_private(dev, sizeof(struct ni_670x_private));
+       if (ret < 0)
                return ret;
 
        ret = ni_670x_find_device(dev, it->options[0], it->options[1]);
@@ -216,7 +218,7 @@ static int ni_670x_detach(struct comedi_device *dev)
                mite_unsetup(devpriv->mite);
 
        if (dev->irq)
-               comedi_free_irq(dev->irq, dev);
+               free_irq(dev->irq, dev);
 
        return 0;
 }