linux-next: Tree for July 1 (staging/comedi)

[Greg KH]

On Fri, Jul 01, 2011 at 03:43:27PM -0700, Randy Dunlap wrote:
> On Fri, 1 Jul 2011 16:05:23 +1000 Stephen Rothwell wrote:
> 
> > Hi all,
> > 
> > Changes since 20110630:
> 
> 
> drivers/staging/comedi/drivers/ni_labpc.c: In function 'labpc_common_attach':
> drivers/staging/comedi/drivers/ni_labpc.c:602: error: implicit declaration of function 'request_dma'
> drivers/staging/comedi/drivers/ni_labpc.c:608: error: implicit declaration of function 'claim_dma_lock'
> drivers/staging/comedi/drivers/ni_labpc.c:611: error: implicit declaration of function 'release_dma_lock'
> drivers/staging/comedi/drivers/ni_labpc.c: In function 'labpc_common_detach':
> drivers/staging/comedi/drivers/ni_labpc.c:803: error: implicit declaration of function 'free_dma'
> 
> 
> on x86_64 when CONFIG_ISA_DMA_API is not enabled.
> 
> Since that driver handles both ISA and PCI devices,
> and the PCI parts are conditional, I guess that the ISA parts also
> need to be made conditional.

Ick.

Care to make a patch?

thanks,

greg k-h