Ian Abbott 0ea6fa037e staging: comedi: Kconfig: fix config COMEDI_ADDI_APCI_3120 dependants ... A merge conflict between commits fbfd9c8a17 ("staging: comedi: addi_apci_3120: use dma_alloc_coherent()") and aff5b1f8eb ("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>		2014-10-29 16:18:31 +08:00
..
drivers	staging: comedi: ni_usb6501: add counter subdevice	2014-09-19 15:58:18 -07:00
kcomedilib	Staging: comedi: kcomedilib: replace deprecated simple_strtoul() with kstrtouint()	2014-02-15 12:42:41 -08:00
comedi_buf.c	staging: comedi: migrate copyrights from "comedi_fc.c"	2014-09-19 15:55:32 -07:00
comedi_compat32.c	staging: comedi: comedi_compat32: checkpatch.pl --strict cleanup	2014-07-18 16:10:39 -07:00
comedi_compat32.h	staging: comedi: comedi_compat32.h: checkpatch.pl --strict cleanup	2014-07-18 16:10:40 -07:00
comedi_fops.c	staging: comedi: widen subdevice number argument in ioctl handlers	2014-10-29 16:18:31 +08:00
comedi_internal.h	staging: comedi: comedi_internal.h: checkpatch.pl --strict cleanup	2014-07-18 16:10:39 -07:00
comedi_pci.c	staging: comedi: comedi_pci: introduce comedi_pci_detach()	2014-08-30 13:24:54 -07:00
comedi_pcmcia.c
comedi_usb.c
comedi.h	staging: comedi: add CMDF_ROUND_... as synonyms for TRIG_ROUND_...	2014-09-08 13:50:14 -07:00
comedidev.h	staging: comedi: add comedi_read_array_from_buffer()	2014-09-19 15:55:32 -07:00
comedilib.h
drivers.c	staging: comedi: migrate copyrights from "comedi_fc.c"	2014-09-19 15:55:32 -07:00
Kconfig	staging: comedi: Kconfig: fix config COMEDI_ADDI_APCI_3120 dependants	2014-10-29 16:18:31 +08:00
Makefile
proc.c	Staging: comedi: proc: title block update	2014-03-19 04:41:04 +00:00
range.c	Staging: comedi: range: remove unnecessary sanity check	2014-03-08 18:59:48 -08:00
TODO	staging: comedi: TODO: remove item "reserve major number"	2014-05-28 14:18:11 -07:00