Commit 0ea6fa03 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: Kconfig: fix config COMEDI_ADDI_APCI_3120 dependants

A merge conflict between commits
fbfd9c8a ("staging: comedi:
addi_apci_3120: use dma_alloc_coherent()") and
aff5b1f8 ("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: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c1a6eac1
...@@ -668,7 +668,6 @@ config COMEDI_ADDI_APCI_2200 ...@@ -668,7 +668,6 @@ config COMEDI_ADDI_APCI_2200
config COMEDI_ADDI_APCI_3120 config COMEDI_ADDI_APCI_3120
tristate "ADDI-DATA APCI_3120/3001 support" tristate "ADDI-DATA APCI_3120/3001 support"
depends on HAS_DMA depends on HAS_DMA
depends on VIRT_TO_BUS
---help--- ---help---
Enable support for ADDI-DATA APCI_3120/3001 cards Enable support for ADDI-DATA APCI_3120/3001 cards
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment