From patchwork Fri Apr 3 12:08:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 16098 X-Patchwork-Delegate: kyle@mcmartin.ca Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n33C97Of019670 for ; Fri, 3 Apr 2009 12:09:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751388AbZDCMJH (ORCPT ); Fri, 3 Apr 2009 08:09:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754821AbZDCMJH (ORCPT ); Fri, 3 Apr 2009 08:09:07 -0400 Received: from rv-out-0506.google.com ([209.85.198.233]:15928 "EHLO rv-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751388AbZDCMJF (ORCPT ); Fri, 3 Apr 2009 08:09:05 -0400 Received: by rv-out-0506.google.com with SMTP id f9so1148952rvb.1 for ; Fri, 03 Apr 2009 05:09:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=3JxuawH1H1t4sl/TQU5qZXjJ9T8LQ2xj4S2dd8uWWSY=; b=wF0Yv+zPUYOIEn1Zy8WuVVrW/2fyDly9G7oarRsfG+dJzcQthQBmvuTB4Ur08Kbzri K8Gvd38zi5Gv42qXKBNl1hkL2UVnfQ6dZpiWAMFWO6HO00OO4tpWxgkdjgJR5R8ztQ/f OKxzL6jNWZE6bioFr4UN7F9FtvCTwpOwbmG6w= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=r7rihe2cznSAmOQgUKEOtKhknSPLkAK/AlfbyZpMKdZUeHNCjRy9g/r8HAiY2IjBWp zuXQgvoesbpHRIi5HniblSyTtNPwbU23KbXX0mHwAEedQIeT9j0xgG1ssFQJehNYEZLv NuwKYkVaekiLN9+C9VIzuqUcJQogjuB84i6Es= Received: by 10.141.210.21 with SMTP id m21mr534589rvq.204.1238760543398; Fri, 03 Apr 2009 05:09:03 -0700 (PDT) Received: from orion ([91.78.19.108]) by mx.google.com with ESMTPS id b8sm6525067rvf.52.2009.04.03.05.08.59 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 03 Apr 2009 05:09:02 -0700 (PDT) Date: Fri, 3 Apr 2009 16:08:54 +0400 From: Alexander Beregalov To: kyle@mcmartin.ca, linux-parisc@vger.kernel.org Subject: [PATCH] parisc: ccio-dma: fix build failure without procfs Message-ID: <20090403120854.GA29187@orion> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org Fix this build error when CONFIG_PROC_FS is not set: drivers/parisc/ccio-dma.c:1574: error: 'ccio_proc_info_fops' undeclared Signed-off-by: Alexander Beregalov --- drivers/parisc/ccio-dma.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c index 5d610cb..0f0e0b9 100644 --- a/drivers/parisc/ccio-dma.c +++ b/drivers/parisc/ccio-dma.c @@ -1134,7 +1134,7 @@ static const struct file_operations ccio_proc_bitmap_fops = { .llseek = seq_lseek, .release = single_release, }; -#endif +#endif /* CONFIG_PROC_FS */ /** * ccio_find_ioc - Find the ioc in the ioc_list @@ -1568,14 +1568,15 @@ static int __init ccio_probe(struct parisc_device *dev) /* if this fails, no I/O cards will work, so may as well bug */ BUG_ON(dev->dev.platform_data == NULL); HBA_DATA(dev->dev.platform_data)->iommu = ioc; - + +#ifdef CONFIG_PROC_FS if (ioc_count == 0) { proc_create(MODULE_NAME, 0, proc_runway_root, &ccio_proc_info_fops); proc_create(MODULE_NAME"-bitmap", 0, proc_runway_root, &ccio_proc_bitmap_fops); } - +#endif ioc_count++; parisc_has_iommu();