]> git.baikalelectronics.ru Git - kernel.git/commit
staging: comedi: Kconfig: fix config COMEDI_ADDI_APCI_3120 dependants
authorIan Abbott <abbotti@mev.co.uk>
Wed, 22 Oct 2014 12:01:47 +0000 (13:01 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Oct 2014 08:18:31 +0000 (16:18 +0800)
commite7f730287ea57a999acfe08466d019c1af7af29a
treed87f062bd3daac86302e80fff94d56189b49817e
parentc70aeaad34536a217cca9e7573d49e9e7d4b3d80
staging: comedi: Kconfig: fix config COMEDI_ADDI_APCI_3120 dependants

A merge conflict between commits
4d69899aca61a8f5731cd8fdfae624cd5df70b7d ("staging: comedi:
addi_apci_3120: use dma_alloc_coherent()") and
a76a769e3b56de4f60ba2797a31342a61aa7d8b5 ("staging: comedi: remove
comedi_fc module") left the COMEDI_ADDI_APCI_3120 config option
depending on VIRT_TO_BUS when it no longer needs to do so.  The
dependency was removed by the first commit and accidentally reinstated
by the second commit.  Remove the dependency again.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/Kconfig