Merge branch 'for-2.6.31' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[pandora-kernel.git] / drivers / staging / comedi / drivers / comedi_parport.c

diff --git a/drivers/staging/comedi/drivers/comedi_parport.c b/drivers/staging/comedi/drivers/comedi_parport.c
index 3848fd4..f42897d 100644 (file)
--- a/drivers/staging/comedi/drivers/comedi_parport.c
+++ b/drivers/staging/comedi/drivers/comedi_parport.c
@@ -310,8 +310,8 @@ static int parport_attach(struct comedi_device *dev, struct comedi_devconfig *it
        irq = it->options[1];
        if (irq) {
                printk(" irq=%u", irq);
-               ret = comedi_request_irq(irq, parport_interrupt, 0,
-                       "comedi_parport", dev);
+               ret = request_irq(irq, parport_interrupt, 0, "comedi_parport",
+                                 dev);
                if (ret < 0) {
                        printk(" irq not available\n");
                        return -EINVAL;
@@ -385,7 +385,7 @@ static int parport_detach(struct comedi_device *dev)
                release_region(dev->iobase, PARPORT_SIZE);
 
        if (dev->irq)
-               comedi_free_irq(dev->irq, dev);
+               free_irq(dev->irq, dev);
 
        return 0;
 }