diff options
| author | Ian Abbott | 2014-10-22 14:01:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-10-29 09:18:31 +0100 |
| commit | 0ea6fa037e961dc77cb2bb7a4ad91d172ee4884a (patch) | |
| tree | d87f062bd3daac86302e80fff94d56189b49817e /drivers/staging/comedi/comedi_fops.c | |
| parent | staging: comedi: widen subdevice number argument in ioctl handlers (diff) | |
| download | kernel-qcow2-linux-0ea6fa037e961dc77cb2bb7a4ad91d172ee4884a.tar.gz kernel-qcow2-linux-0ea6fa037e961dc77cb2bb7a4ad91d172ee4884a.tar.xz kernel-qcow2-linux-0ea6fa037e961dc77cb2bb7a4ad91d172ee4884a.zip | |
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>
Diffstat (limited to 'drivers/staging/comedi/comedi_fops.c')
0 files changed, 0 insertions, 0 deletions