| Message ID | 49E42A57.50506@cn.fujitsu.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
From: Wei Yongjun <yjwei@cn.fujitsu.com> Date: Tue, 14 Apr 2009 14:16:55 +0800 > commit 51dcdfec6a274afc1c6fce180d582add9ff512c0 (parport: Use the PCI > IRQ if offered) parport_pc_probe_port() gained an irqflags arg. This > isn't being supplied on sparc. This patch make sparc fallback to the > old behaviour, that is using 0 for irqflags. > > No test. > > Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com> Applied, thank you. -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Apr 14, 2009 at 02:16:55PM +0800, Wei Yongjun wrote: > commit 51dcdfec6a274afc1c6fce180d582add9ff512c0 (parport: Use the PCI > IRQ if offered) parport_pc_probe_port() gained an irqflags arg. This > isn't being supplied on sparc. This patch make sparc fallback to the > old behaviour, that is using 0 for irqflags. FWIW looks like this is already in Linus' tree: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=28783eb52013ad20784550bccd482e541c9619c2
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;
commit 51dcdfec6a274afc1c6fce180d582add9ff512c0 (parport: Use the PCI IRQ if offered) parport_pc_probe_port() gained an irqflags arg. This isn't being supplied on sparc. This patch make sparc fallback to the old behaviour, that is using 0 for irqflags. No test. Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com> --- arch/sparc/include/asm/parport.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)