| Message ID | 20090403120854.GA29187@orion (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | kyle mcmartin |
| Headers | show |
On Fri, Apr 03, 2009 at 04:08:54PM +0400, Alexander Beregalov wrote: > 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 <a.beregalov@gmail.com> Applied to the fixes branch. cheers, Kyle -- 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
2009/4/3 Kyle McMartin <kyle@mcmartin.ca>: > On Fri, Apr 03, 2009 at 04:08:54PM +0400, Alexander Beregalov wrote: >> 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 <a.beregalov@gmail.com> > > Applied to the fixes branch. Hi Kyle. It still fails with linux-next. Could you please send it to Linus or ask Stephen to pull different branch (with all latest changes) of your tree? Thanks. -- 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();
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 <a.beregalov@gmail.com> --- 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