linux-kernel - Re: [PATCH] staging: fix comedi build when ISA_DMA_API is enabled but COMEDI

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20110912145320.GA28855@kroah.com>
Date:	Mon, 12 Sep 2011 16:53:20 +0200
From:	Greg KH <greg@...ah.com>
To:	Randy Dunlap <rdunlap@...otime.net>
Cc:	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Greg KH <gregkh@...e.de>,
	driverdevel <devel@...verdev.osuosl.org>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Ian Abbott <abbotti@....co.uk>,
	Frank Mori Hess <fmhess@...rs.sourceforge.net>
Subject: Re: [PATCH] staging: fix comedi build when ISA_DMA_API is enabled
 but COMEDI_PCI is not enabled

On Thu, Sep 08, 2011 at 09:06:17AM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@...otime.net>
> 
> Fix build when CONFIG_ISA_DMA_API is enabled but
> CONFIG_COMEDI_PCI[_DRIVERS] is not enabled.
> Fixes these build errors:
> 
> drivers/staging/comedi/drivers/ni_labpc.c: In function 'labpc_ai_cmd':
> drivers/staging/comedi/drivers/ni_labpc.c:1351: error: implicit declaration of function 'labpc_suggest_transfer_size'
> drivers/staging/comedi/drivers/ni_labpc.c: At top level:
> drivers/staging/comedi/drivers/ni_labpc.c:1802: error: conflicting types for 'labpc_suggest_transfer_size'
> drivers/staging/comedi/drivers/ni_labpc.c:1351: note: previous implicit declaration of 'labpc_suggest_transfer_size' was here
> 
> Signed-off-by: Randy Dunlap <rdunlap@...otime.net>
> ---
> 
> Greg, I had previously said that this patch was not needed since
> you had merged a larger patch, but I had another build error which
> this patch fixes, so it is now needed in mainline.

So this is needed in Linus's tree now?  Or in linux-next?  It doesn't
apply to my staging-next tree so I'm confused.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/