]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
staging: fix comedi build when ISA_DMA_API is enabled but COMEDI_PCI is not enabled
authorRandy Dunlap <rdunlap@xenotime.net>
Mon, 19 Sep 2011 23:05:10 +0000 (16:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Sep 2011 00:15:46 +0000 (17:15 -0700)
commitc19cc78efe922e86da7ba694dbfc4be066dd7eb4
treeac4322e33743be3f12ca6b7c2fa8085911138d7c
parent58c3c3aa01b455ecb99d61ce73f1444274af696b
staging: fix comedi build when ISA_DMA_API is enabled but COMEDI_PCI is not enabled

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/staging/comedi/drivers/ni_labpc.c