diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2014-10-22 08:01:47 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-29 04:18:31 -0400 |
| commit | 0ea6fa037e961dc77cb2bb7a4ad91d172ee4884a (patch) | |
| tree | d87f062bd3daac86302e80fff94d56189b49817e | |
| parent | c1a6eac1694b1236115ee6e93a4efbf02d05fea3 (diff) | |
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>
| -rw-r--r-- | drivers/staging/comedi/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig index b709736c6833..152f4c12ea43 100644 --- a/drivers/staging/comedi/Kconfig +++ b/drivers/staging/comedi/Kconfig | |||
| @@ -668,7 +668,6 @@ config COMEDI_ADDI_APCI_2200 | |||
| 668 | config COMEDI_ADDI_APCI_3120 | 668 | config COMEDI_ADDI_APCI_3120 |
| 669 | tristate "ADDI-DATA APCI_3120/3001 support" | 669 | tristate "ADDI-DATA APCI_3120/3001 support" |
| 670 | depends on HAS_DMA | 670 | depends on HAS_DMA |
| 671 | depends on VIRT_TO_BUS | ||
| 672 | ---help--- | 671 | ---help--- |
| 673 | Enable support for ADDI-DATA APCI_3120/3001 cards | 672 | Enable support for ADDI-DATA APCI_3120/3001 cards |
| 674 | 673 | ||