Skip to content

Commit

Permalink
staging: comedi: Kconfig: fix config COMEDI_ADDI_APCI_3120 dependants
Browse files Browse the repository at this point in the history
A merge conflict between commits
fbfd9c8 ("staging: comedi:
addi_apci_3120: use dma_alloc_coherent()") and
aff5b1f ("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>
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Oct 29, 2014
1 parent c1a6eac commit 0ea6fa0
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion drivers/staging/comedi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 0ea6fa0

Please sign in to comment.