mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-10 07:10:27 +00:00
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>
This commit is contained in:
parent
c1a6eac169
commit
0ea6fa037e
@ -668,7 +668,6 @@ config COMEDI_ADDI_APCI_2200
|
||||
config COMEDI_ADDI_APCI_3120
|
||||
tristate "ADDI-DATA APCI_3120/3001 support"
|
||||
depends on HAS_DMA
|
||||
depends on VIRT_TO_BUS
|
||||
---help---
|
||||
Enable support for ADDI-DATA APCI_3120/3001 cards
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user