Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54f74b49 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

staging: comedi: labpc: fix isadma dependency 



When COMEDI_NI_LABPC is built-in and COMEDI_NI_LABPC_ISA is a loadable
module, thhe ISA DMA code is not reachable by the common module, causing
a link error:

drivers/staging/built-in.o: In function `labpc_interrupt':
ni_labpc_common.c:(.text+0x1d178): undefined reference to `labpc_handle_dma_status'
ni_labpc_common.c:(.text+0x1d1cb): undefined reference to `labpc_drain_dma'
drivers/staging/built-in.o: In function `labpc_ai_cmd':
ni_labpc_common.c:(.text+0x1d8ad): undefined reference to `labpc_setup_dma'

This changes the definition of COMEDI_NI_LABPC_ISADMA so that it will
also be builtin for that case. This looks like a rather old bug, but
I have never seen this in randconfig testing until today.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 554c0a3a

drivers/staging/comedi/Kconfig

+3 −1
Original line number Original line Diff line number Diff line
@@ -505,7 +505,6 @@ config COMEDI_NI_ATMIO16D 
config COMEDI_NI_LABPC_ISA

config COMEDI_NI_LABPC_ISA

	tristate "NI Lab-PC and compatibles ISA support"

	tristate "NI Lab-PC and compatibles ISA support"

	select COMEDI_NI_LABPC

	select COMEDI_NI_LABPC

	select COMEDI_NI_LABPC_ISADMA if ISA_DMA_API

	---help---

	---help---

	  Enable support for National Instruments Lab-PC and compatibles

	  Enable support for National Instruments Lab-PC and compatibles

	  Lab-PC-1200, Lab-PC-1200AI, Lab-PC+.

	  Lab-PC-1200, Lab-PC-1200AI, Lab-PC+.
@@ -1315,6 +1314,9 @@ config COMEDI_NI_LABPC 




config COMEDI_NI_LABPC_ISADMA

config COMEDI_NI_LABPC_ISADMA

	tristate

	tristate

	default COMEDI_NI_LABPC

	depends on COMEDI_NI_LABPC_ISA != n

	depends on ISA_DMA_API

	select COMEDI_ISADMA

	select COMEDI_ISADMA





config COMEDI_NI_TIO

config COMEDI_NI_TIO