From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756080AbZDNM7r (ORCPT ); Tue, 14 Apr 2009 08:59:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752339AbZDNM7h (ORCPT ); Tue, 14 Apr 2009 08:59:37 -0400 Received: from earthlight.etchedpixels.co.uk ([81.2.110.250]:32939 "EHLO t61.ukuu.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751427AbZDNM7g (ORCPT ); Tue, 14 Apr 2009 08:59:36 -0400 From: Alan Cox Subject: [PATCH 3/4] parport: Fix various uses of parport_pc To: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org Date: Tue, 14 Apr 2009 14:58:23 +0100 Message-ID: <20090414135817.13935.89225.stgit@t61.ukuu.org.uk> In-Reply-To: <20090414135501.13935.13500.stgit@t61.ukuu.org.uk> References: <20090414135501.13935.13500.stgit@t61.ukuu.org.uk> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org These got overlooked first time around. Signed-off-by: Alan Cox --- arch/sparc/include/asm/parport.h | 5 +++-- drivers/parisc/superio.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/sparc/include/asm/parport.h b/arch/sparc/include/asm/parport.h index dff3f02..ff9ead6 100644 --- a/arch/sparc/include/asm/parport.h +++ b/arch/sparc/include/asm/parport.h @@ -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; diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c index 4fa3bb2..33e5ade 100644 --- a/drivers/parisc/superio.c +++ b/drivers/parisc/superio.c @@ -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 */