lkml.org 
[lkml]   [2011]   [Sep]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [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@xenotime.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@xenotime.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


\
 
 \ /
  Last update: 2011-09-12 16:55    [W:0.050 / U:0.024 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site