From e7f730287ea57a999acfe08466d019c1af7af29a Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Wed, 22 Oct 2014 13:01:47 +0100 Subject: [PATCH] staging: comedi: Kconfig: fix config COMEDI_ADDI_APCI_3120 dependants A merge conflict between commits 4d69899aca61a8f5731cd8fdfae624cd5df70b7d ("staging: comedi: addi_apci_3120: use dma_alloc_coherent()") and a76a769e3b56de4f60ba2797a31342a61aa7d8b5 ("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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig index b709736c68337..152f4c12ea43d 100644 --- a/drivers/staging/comedi/Kconfig +++ b/drivers/staging/comedi/Kconfig @@ -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 -- 2.39.5