[PATCH] staging: comedi: Kconfig: fix config COMEDI_ADDI_APCI_3120 dependants

2014-10-22 Thread Ian Abbott
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

[PATCH] staging: comedi: Kconfig: fix config COMEDI_ADDI_APCI_3120 dependants

2014-10-22 Thread Ian Abbott
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