summaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi/Kconfig
Commit message (Collapse)AuthorAgeFilesLines
* Staging: comedi: fixing ni_labpc to mite dependancyAlexander Kurz2010-06-041-0/+1
| | | | | | | | | | the dependancy of ni_labpc on mite was missing, Signed-off-by: Alexander Kurz <linux@kbdbabel.org> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> index 0aa2b0d..79f5f2e 100644
* Staging: comedi: fixing ni_tio to mite PCI dependancyAlexander Kurz2010-06-041-1/+1
| | | | | | | | | | | | | | | | | | On Wed, 19 May 2010, Randy Dunlap wrote: > linux-next of 2010-0519: > when CONFIG_PCI is not enabled: > > drivers/staging/comedi/drivers/mite.c: In function 'mite_init': > drivers/staging/comedi/drivers/mite.c:89: error: implicit declaration of function 'pci_dev_get' > drivers/staging/comedi/drivers/mite.c:89: warning: assignment makes pointer from integer without a cast > make[5]: *** [drivers/staging/comedi/drivers/mite.o] Error 1 This patch fixes the problem. Signed-off-by: Alexander Kurz <linux@kbdbabel.org> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: fix 8255 and DAS08 Kconfig dependancies.Alexander Kurz2010-06-041-21/+57
| | | | | | | | | Both drivers support directly or indirectly multiple bus types, hence both are listed independent of bus types. Signed-off-by: Alexander Kurz <linux@kbdbabel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: Kconfig dependancy fixesAlexander Kurz2010-05-181-3/+2
| | | | | | | | | | | | | | | | 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>
* Staging: comedi: new Kconfig and Makefiles, drivers grouped by bustype.Alexander Kurz2010-05-181-7/+1276
| | | | | | | | | | | | | | | | | PC/104-drivers went into ISA, PC/104+ went into PCI, Drivers without a bustype went into "misc". In doubt drivers supporting both ISA/PCI went into PCI. Drivers without any detailed hardware info went into ISA, e.g. fl512.c Some NI drivers are used by other NI drivers from different bustypes are grouped seperately in NI_COMMON. [tweaked by gregkh to handle the new driver recently added] Signed-off-by: Alexander Kurz <linux@kbdbabel.org> Acked-by: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@speakeasy.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: fix build on arches that don't want comedi driversGreg Kroah-Hartman2009-10-091-1/+1
| | | | | | | | | | | | This should fix the problem of comedi drivers showing up on arches that can not support the comedi subsystem (like s390). Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: comedi: fix pcmcia build breakageGreg Kroah-Hartman2009-06-191-2/+2
| | | | | | | | Add PCCARD dependancy to the PCMCIA drivers to fix build breakage. Reported-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: remove RT codeGreg Kroah-Hartman2009-06-191-7/+0
| | | | | | | | | | | This removes the unused RT code from the comedi subsystem. A lot of drivers needed to then include interrupt.h on their own, as they were picking it up through the comedi_rt.h inclusion. Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: Fixed Kconfig option for COMEDI_PCMCIA_DRIVERSFrank Mori Hess2009-06-191-1/+1
| | | | | | Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6Linus Torvalds2009-04-051-0/+14
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (714 commits) Staging: sxg: slicoss: Specify the license for Sahara SXG and Slicoss drivers Staging: serqt_usb: fix build due to proc tty changes Staging: serqt_usb: fix checkpatch errors Staging: serqt_usb: add TODO file Staging: serqt_usb: Lindent the code Staging: add USB serial Quatech driver staging: document that the wifi staging drivers a bit better Staging: echo cleanup Staging: BUG to BUG_ON changes Staging: remove some pointless conditionals before kfree_skb() Staging: line6: fix build error, select SND_RAWMIDI Staging: line6: fix checkpatch errors in variax.c Staging: line6: fix checkpatch errors in toneport.c Staging: line6: fix checkpatch errors in pcm.c Staging: line6: fix checkpatch errors in midibuf.c Staging: line6: fix checkpatch errors in midi.c Staging: line6: fix checkpatch errors in dumprequest.c Staging: line6: fix checkpatch errors in driver.c Staging: line6: fix checkpatch errors in audio.c Staging: line6: fix checkpatch errors in pod.c ...
| * Staging: comedi: add new drivers to the kernel buildGreg Kroah-Hartman2009-04-031-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | This adds all of the recently added drivers to the build system. Also splits out the pcmcia drivers so we don't get build errors when we don't want to. Cc: David Schleef <ds@schleef.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>
| * Staging: comedi: usbduxfast: add comedi debug to KconfigMariusz Kozlowski2009-04-031-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch moves CONFIG_COMEDI_DEBUG to Kconfig and cleans up the code as it didn't actually compile with debug enabled. Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl> Cc: Bernd Porr <BerndPorr@f2s.com> Cc: David Schleef <ds@schleef.org> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | trivial: fix typos/grammar errors in Kconfig textsMatt LaPlante2009-03-301-2/+2
|/ | | | | | Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* Staging: comedi: fix KbuildGreg Kroah-Hartman2009-01-281-0/+1
| | | | | | | | | | comedi doesn't like being built into the kernel right now, so force it to be a module. Reported-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> Reported-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: set up infrastructure for individual driversGreg Kroah-Hartman2009-01-061-0/+14
| | | | | | | | | | | | | This adds two "generic" Kconfig options, one for PCI and one for USB comedi drivers, and the Makefile infrastructure as well. This is so we can start adding individual comedi drivers and add them to the build properly. Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Cc: David Schleef <ds@schleef.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: add comedi coreDavid Schleef2009-01-061-0/+13
This adds the Comedi core to the staging tree. This is a data acquision infrastructure for Linux, providing a common interface for these types of drivers. Taken directly from the comedi git tree, with only minor tweaks by Greg to get it to build properly within the kernel tree. From: David Schleef <ds@schleef.org> Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Shawn Bohrer <shawn.bohrer@gmail.com> Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
OpenPOWER on IntegriCloud