aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorAlexander Kurz <linux@blala.de>2010-05-15 08:09:01 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-18 17:31:34 -0400
commitba2450b89bd9dce7d8926d919a67ed515be3e05f (patch)
tree195ea01d38292a42bf95b07a7c5e77c633316fe2 /drivers/staging
parent77f047e25716cdefae7273d4e55f2cf74144c553 (diff)
Staging: comedi: Kconfig dependancy fixes
There are three minor changes I would like to do on my last patch: * Comedi is formally not dependant on any hardware, e.g. it is possible to use comedi_test without (PCI || PCMCIA || PCCARD || USB || ISA) * comedi_parport is not dependant on PARPORT_PC. * indirect ni_mio_cs (16-bit PCMCIA) dependancy on mite PCI-chip may confuse users, thus changing COMEDI_NI_TIO depends on COMEDI_MITE to select COMEDI_MITE. Signed-off-by: Alexander Kurz <linux@kbdbabel.org> Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/comedi/Kconfig5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index 283ea0ceddf0..8ce307e64b58 100644
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -1,7 +1,7 @@
1config COMEDI 1config COMEDI
2 tristate "Data acquisition support (comedi)" 2 tristate "Data acquisition support (comedi)"
3 default N 3 default N
4 depends on m && (PCI || PCMCIA || PCCARD || USB) 4 depends on m
5 ---help--- 5 ---help---
6 Enable support a wide range of data acquisition devices 6 Enable support a wide range of data acquisition devices
7 for Linux. 7 for Linux.
@@ -57,7 +57,6 @@ config COMEDI_TEST
57 57
58config COMEDI_PARPORT 58config COMEDI_PARPORT
59 tristate "Parallel port support" 59 tristate "Parallel port support"
60 depends on PARPORT_PC
61 default N 60 default N
62 ---help--- 61 ---help---
63 Enable support for the standard parallel port. 62 Enable support for the standard parallel port.
@@ -1266,7 +1265,7 @@ config COMEDI_MITE
1266 1265
1267config COMEDI_NI_TIO 1266config COMEDI_NI_TIO
1268 tristate "NI general purpose counter support" 1267 tristate "NI general purpose counter support"
1269 depends on COMEDI_MITE 1268 select COMEDI_MITE
1270 default N 1269 default N
1271 ---help--- 1270 ---help---
1272 Enable support for National Instruments general purpose counters. 1271 Enable support for National Instruments general purpose counters.