From patchwork Tue Apr 14 06:16:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 25921 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 88EECDE0D3 for ; Tue, 14 Apr 2009 16:19:03 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751741AbZDNGS3 (ORCPT ); Tue, 14 Apr 2009 02:18:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751711AbZDNGS3 (ORCPT ); Tue, 14 Apr 2009 02:18:29 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:64342 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753924AbZDNGS2 (ORCPT ); Tue, 14 Apr 2009 02:18:28 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 91343170151; Tue, 14 Apr 2009 15:07:34 +0800 (CST) Received: from fnst.cn.fujitsu.com (localhost.localdomain [127.0.0.1]) by tang.cn.fujitsu.com (8.13.1/8.13.1) with ESMTP id n3E6IPgJ031676; Tue, 14 Apr 2009 14:18:26 +0800 Received: from [127.0.0.1] (unknown [10.167.141.76]) by fnst.cn.fujitsu.com (Postfix) with ESMTP id 6BAE8D402F; Tue, 14 Apr 2009 14:24:14 +0800 (CST) Message-ID: <49E42A57.50506@cn.fujitsu.com> Date: Tue, 14 Apr 2009 14:16:55 +0800 From: Wei Yongjun User-Agent: Thunderbird 2.0.0.6 (Windows/20070728) MIME-Version: 1.0 To: "David S. Miller" CC: sparclinux@vger.kernel.org, Wei Yongjun Subject: [PATCH] sparc: fix possible build error in arch/sparc/include/asm/parport.h Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org 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 --- arch/sparc/include/asm/parport.h | 5 +++-- 1 files changed, 3 insertions(+), 2 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;