parport: Fix various uses of parport_pc
authorAlan Cox <alan@lxorguk.ukuu.org.uk>
Tue, 14 Apr 2009 13:58:23 +0000 (14:58 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Apr 2009 15:48:50 +0000 (08:48 -0700)
These got overlooked first time around.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/sparc/include/asm/parport.h
drivers/parisc/superio.c

index dff3f02..ff9ead6 100644 (file)
@@ -117,7 +117,7 @@ static int __devinit ecpp_probe(struct of_device *op, const struct of_device_id
        if (!strcmp(parent->name, "dma")) {
                p = parport_pc_probe_port(base, base + 0x400,
                                          op->irqs[0], PARPORT_DMA_NOFIFO,
-                                         op->dev.parent->parent);
+                                         op->dev.parent->parent, 0);
                if (!p)
                        return -ENOMEM;
                dev_set_drvdata(&op->dev, p);
@@ -168,7 +168,8 @@ static int __devinit ecpp_probe(struct of_device *op, const struct of_device_id
        p = parport_pc_probe_port(base, base + 0x400,
                                  op->irqs[0],
                                  slot,
-                                 op->dev.parent);
+                                 op->dev.parent,
+                                 0);
        err = -ENOMEM;
        if (!p)
                goto out_disable_irq;
index 4fa3bb2..33e5ade 100644 (file)
@@ -434,7 +434,8 @@ static void __init superio_parport_init(void)
                        0 /*base_hi*/,
                        PAR_IRQ, 
                        PARPORT_DMA_NONE /* dma */,
-                       NULL /*struct pci_dev* */) )
+                       NULL /*struct pci_dev* */),
+                       0 /* shared irq flags */ )
 
                printk(KERN_WARNING PFX "Probing parallel port failed.\n");
 #endif /* CONFIG_PARPORT_PC */