OSDN Git Service

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)
commit0ea6fa037e961dc77cb2bb7a4ad91d172ee4884a
treed87f062bd3daac86302e80fff94d56189b49817e
parentc1a6eac1694b1236115ee6e93a4efbf02d05fea3
staging: comedi: Kconfig: fix config COMEDI_ADDI_APCI_3120 dependants

A merge conflict between commits
fbfd9c8a1782f33d7b67294b2a42587063e61c0c ("staging: comedi:
addi_apci_3120: use dma_alloc_coherent()") and
aff5b1f8eb71b64bb613dc64c50b6904e89f79b9 ("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