Re: [PATCH -next] staging: fix comedi build when COMEDI_PCI is notenabled

[Randy Dunlap]

On Tue, 23 Aug 2011 11:58:05 -0700 Greg KH wrote:

> On Mon, Aug 22, 2011 at 11:13:14AM -0700, Randy Dunlap wrote:
> > From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
> > 
> > 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@xxxxxxxxxxxx>
> > ---
> >  drivers/staging/comedi/drivers/ni_labpc.c |    4 +++-
> 
> I applied your older patch, which causes this one to not apply.  Is it
> still needed as well?

Nope, the second (more recent) one is not needed.  Thanks.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/