aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorAlexander Kurz <linux@kbdbabel.org>2010-05-08 04:21:45 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-18 17:23:12 -0400
commitf1d7dbbef51a624ff0ec76f022802d677fdb9888 (patch)
tree18113ddec5af0fb3c8f98af94830ff367dd187cc /drivers/staging
parent59497bba59035a2b09ac21f96bb904d1101bd95f (diff)
Staging: comedi: new Kconfig and Makefiles, drivers grouped by bustype.
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>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/comedi/Kconfig1283
-rw-r--r--drivers/staging/comedi/drivers/Makefile247
-rw-r--r--drivers/staging/comedi/kcomedilib/Makefile2
3 files changed, 1402 insertions, 130 deletions
diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index d63c889ce557..283ea0ceddf0 100644
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -9,27 +9,1296 @@ config COMEDI
9config COMEDI_DEBUG 9config COMEDI_DEBUG
10 bool "Comedi debugging" 10 bool "Comedi debugging"
11 depends on COMEDI != n 11 depends on COMEDI != n
12 help 12 ---help---
13 This is an option for use by developers; most people should 13 This is an option for use by developers; most people should
14 say N here. This enables comedi core and driver debugging. 14 say N here. This enables comedi core and driver debugging.
15 15
16config COMEDI_PCI_DRIVERS 16menuconfig COMEDI_MISC_DRIVERS
17 tristate "Comedi misc drivers"
18 depends on COMEDI
19 default N
20 ---help---
21 Enable comedi misc drivers to be built
22
23 Note that the answer to this question won't directly affect the
24 kernel: saying N will just cause the configurator to skip all
25 the questions about misc non-hardware comedi drivers.
26
27if COMEDI_MISC_DRIVERS
28
29config COMEDI_KCOMEDILIB
30 tristate "Comedi kcomedilib"
31 ---help---
32 Build the kcomedilib
33
34config COMEDI_BOND
35 tristate "Device bonding support"
36 depends on COMEDI_KCOMEDILIB
37 default N
38 ---help---
39 Enable support for a driver to 'bond' (merge) multiple subdevices
40 from multiple devices together as one.
41
42 To compile this driver as a module, choose M here: the module will be
43 called comedi_bond.
44
45config COMEDI_TEST
46 tristate "Fake waveform generator support"
47 select COMEDI_FC
48 default N
49 ---help---
50 Enable support for the fake waveform generator.
51 This driver is mainly for testing purposes, but can also be used to
52 generate sample waveforms on systems that don't have data acquisition
53 hardware.
54
55 To compile this driver as a module, choose M here: the module will be
56 called comedi_test.
57
58config COMEDI_PARPORT
59 tristate "Parallel port support"
60 depends on PARPORT_PC
61 default N
62 ---help---
63 Enable support for the standard parallel port.
64 A cheap and easy way to get a few more digital I/O lines. Steal
65 additional parallel ports from old computers or your neighbors'
66 computers.
67
68 To compile this driver as a module, choose M here: the module will be
69 called comedi_parport.
70
71config COMEDI_SERIAL2002
72 tristate "Driver for serial connected hardware"
73 default N
74 ---help---
75 Enable support for serial connected hardware
76
77 To compile this driver as a module, choose M here: the module will be
78 called serial2002.
79
80config COMEDI_SKEL
81 tristate "Comedi skeleton driver"
82 default N
83 ---help---
84 Build the Skeleton driver, an example for driver writers
85
86 To compile this driver as a module, choose M here: the module will be
87 called skel.
88
89endif # COMEDI_MISC_DRIVERS
90
91menuconfig COMEDI_ISA_DRIVERS
92 tristate "Comedi ISA and PC/104 drivers"
93 depends on COMEDI && ISA
94 default N
95 ---help---
96 Enable comedi ISA and PC/104 drivers to be built
97
98 Note that the answer to this question won't directly affect the
99 kernel: saying N will just cause the configurator to skip all
100 the questions about ISA and PC/104 comedi drivers.
101
102if COMEDI_ISA_DRIVERS && ISA
103
104config COMEDI_8255
105 tristate "Generic 8255 support"
106 default N
107 ---help---
108 Enable generic 8255 support.
109
110 To compile this driver as a module, choose M here: the module will be
111 called 8255.
112
113config COMEDI_ACL7225B
114 tristate "ADlink NuDAQ ACL-7225b and compatibles support"
115 default N
116 ---help---
117 Enable support for ADlink NuDAQ ACL-7225b and compatibles,
118 ADlink ACL-7225b (acl7225b), ICP P16R16DIO (p16r16dio)
119
120 To compile this driver as a module, choose M here: the module will be
121 called acl7225b.
122
123config COMEDI_PCL711
124 tristate "Advantech PCL-711/711b and ADlink ACL-8112 ISA card support"
125 default N
126 ---help---
127 Enable support for Advantech PCL-711 and 711b, ADlink ACL-8112
128
129 To compile this driver as a module, choose M here: the module will be
130 called pcl711.
131
132config COMEDI_PCL724
133 tristate "Advantech PCL-722/724/731 and ADlink ACL-7122/7124/PET-48DIO"
134 default N
135 ---help---
136 Enable support for Advantech PCL-724, PCL-722, PCL-731 and
137 ADlink ACL-7122, ACL-7124, PET-48DIO ISA cards
138
139 To compile this driver as a module, choose M here: the module will be
140 called pcl724.
141
142config COMEDI_PCL725
143 tristate "Advantech PCL-725 and compatible ISA card support"
144 default N
145 ---help---
146 Enable support for Advantech PCL-725 and compatible ISA cards.
147
148 To compile this driver as a module, choose M here: the module will be
149 called pcl725.
150
151config COMEDI_PCL726
152 tristate "Advantech PCL-726 and compatible ISA card support"
153 default N
154 ---help---
155 Enable support for Advantech PCL-726 and compatible ISA cards.
156
157 To compile this driver as a module, choose M here: the module will be
158 called pcl726.
159
160config COMEDI_PCL730
161 tristate "Advantech PCL-730 and ADlink ACL-7130 ISA card support"
162 default N
163 ---help---
164 Enable support for Advantech PCL-730, ICP ISO-730 and ADlink
165 ACL-7130 ISA cards
166
167 To compile this driver as a module, choose M here: the module will be
168 called pcl730.
169
170config COMEDI_PCL812
171 tristate "Advantech PCL-812/813 and ADlink ACL-8112/8113/8113/8216"
172 default N
173 ---help---
174 Enable support for Advantech PCL-812/PG, PCL-813/B, ADLink
175 ACL-8112DG/HG/PG, ACL-8113, ACL-8216, ICP DAS A-821PGH/PGL/PGL-NDA,
176 A-822PGH/PGL, A-823PGH/PGL, A-826PG and ICP DAS ISO-813 ISA cards
177
178 To compile this driver as a module, choose M here: the module will be
179 called pcl812.
180
181config COMEDI_PCL816
182 tristate "Advantech PCL-814 and PCL-816 ISA card support"
183 default N
184 ---help---
185 Enable support for Advantech PCL-814 and PCL-816 ISA cards
186
187 To compile this driver as a module, choose M here: the module will be
188 called pcl816.
189
190config COMEDI_PCL818
191 tristate "Advantech PCL-718 and PCL-818 ISA card support"
192 default N
193 ---help---
194 Enable support for Advantech PCL-818 ISA cards
195 PCL-818L, PCL-818H, PCL-818HD, PCL-818HG, PCL-818 and PCL-718
196
197 To compile this driver as a module, choose M here: the module will be
198 called pcl818.
199
200config COMEDI_PCM3724
201 tristate "Advantech PCM-3724 PC/104 card support"
202 default N
203 ---help---
204 Enable support for Advantech PCM-3724 PC/104 cards.
205
206 To compile this driver as a module, choose M here: the module will be
207 called pcm3724.
208
209config COMEDI_PCM3730
210 tristate "Advantech PCM-3730 and clone PC/104 board support"
211 default N
212 ---help---
213 Enable support for Advantech PCM-3730 and clone PC/104 boards
214
215 To compile this driver as a module, choose M here: the module will be
216 called pcm3730.
217
218config COMEDI_RTI800
219 tristate "Analog Devices RTI-800/815 ISA card support"
220 default N
221 ---help---
222 Enable support for Analog Devices RTI-800/815 ISA cards
223
224 To compile this driver as a module, choose M here: the module will be
225 called rti800.
226
227config COMEDI_RTI802
228 tristate "Analog Devices RTI-802 ISA card support"
229 default N
230 ---help---
231 Enable support for Analog Devices RTI-802 ISA cards
232
233 To compile this driver as a module, choose M here: the module will be
234 called rti802.
235
236config COMEDI_DAS08
237 tristate "DAS-08 compatible ISA, PC/104 and PCMCIA card support"
238 default N
239 ---help---
240 Enable support for Keithley Metrabyte/ComputerBoards DAS08
241 and compatible ISA and PC/104 cards
242
243 To compile this driver as a module, choose M here: the module will be
244 called das08.
245
246config COMEDI_DAS16M1
247 tristate "MeasurementComputing CIO-DAS16/M1DAS-16 ISA card support"
248 select COMEDI_FC
249 default N
250 ---help---
251 Enable support for Measurement Computing CIO-DAS16/M1 ISA cards.
252
253 To compile this driver as a module, choose M here: the module will be
254 called das16m1.
255
256config COMEDI_DAS16
257 tristate "DAS-16 compatible ISA and PC/104 card support"
258 select COMEDI_FC
259 default N
260 ---help---
261 Enable support for Keithley Metrabyte/ComputerBoards DAS16
262 and compatible ISA and PC/104 cards:
263 Keithley Metrabyte DAS-16, DAS-16G, DAS-16F, DAS-1201, DAS-1202,
264 DAS-1401, DAS-1402, DAS-1601, DAS-1602 and
265 ComputerBoards/MeasurementComputing PC104-DAS16/JR/,
266 PC104-DAS16JR/16, CIO-DAS16JR/16, CIO-DAS16/JR, CIO-DAS1401/12,
267 CIO-DAS1402/12, CIO-DAS1402/16, CIO-DAS1601/12, CIO-DAS1602/12,
268 CIO-DAS1602/16, CIO-DAS16/330
269
270 To compile this driver as a module, choose M here: the module will be
271 called das16.
272
273config COMEDI_DAS800
274 tristate "DAS800 and compatible ISA card support"
275 select COMEDI_FC
276 default N
277 ---help---
278 Enable support for Keithley Metrabyte DAS800 and compatible ISA cards
279 Keithley Metrabyte DAS-800, DAS-801, DAS-802
280 Measurement Computing CIO-DAS800, CIO-DAS801, CIO-DAS802 and
281 CIO-DAS802/16
282
283 To compile this driver as a module, choose M here: the module will be
284 called das800.
285
286config COMEDI_DAS1800
287 tristate "DAS1800 and compatible ISA card support"
288 select COMEDI_FC
289 default N
290 ---help---
291 Enable support for DAS1800 and compatible ISA cards
292 Keithley Metrabyte DAS-1701ST, DAS-1701ST-DA, DAS-1701/AO,
293 DAS-1702ST, DAS-1702ST-DA, DAS-1702HR, DAS-1702HR-DA, DAS-1702/AO,
294 DAS-1801ST, DAS-1801ST-DA, DAS-1801HC, DAS-1801AO, DAS-1802ST,
295 DAS-1802ST-DA, DAS-1802HR, DAS-1802HR-DA, DAS-1802HC and
296 DAS-1802AO
297
298 To compile this driver as a module, choose M here: the module will be
299 called das1800.
300
301config COMEDI_DAS6402
302 tristate "DAS6402 and compatible ISA card support"
303 default N
304 ---help---
305 Enable support for DAS6402 and compatible ISA cards
306 Computerboards, Keithley Metrabyte DAS6402 and compatibles
307
308 To compile this driver as a module, choose M here: the module will be
309 called das6402.
310
311config COMEDI_DT2801
312 tristate "Data Translation DT2801 ISA card support"
313 default N
314 ---help---
315 Enable support for Data Translation DT2801 ISA cards
316
317 To compile this driver as a module, choose M here: the module will be
318 called dt2801.
319
320config COMEDI_DT2811
321 tristate "Data Translation DT2811 ISA card support"
322 default N
323 ---help---
324 Enable support for Data Translation DT2811 ISA cards
325
326 To compile this driver as a module, choose M here: the module will be
327 called dt2811.
328
329config COMEDI_DT2814
330 tristate "Data Translation DT2814 ISA card support"
331 default N
332 ---help---
333 Enable support for Data Translation DT2814 ISA cards
334
335 To compile this driver as a module, choose M here: the module will be
336 called dt2814.
337
338config COMEDI_DT2815
339 tristate "Data Translation DT2815 ISA card support"
340 default N
341 ---help---
342 Enable support for Data Translation DT2815 ISA cards
343
344 To compile this driver as a module, choose M here: the module will be
345 called dt2815.
346
347config COMEDI_DT2817
348 tristate "Data Translation DT2817 ISA card support"
349 default N
350 ---help---
351 Enable support for Data Translation DT2817 ISA cards
352
353 To compile this driver as a module, choose M here: the module will be
354 called dt2817.
355
356config COMEDI_DT282X
357 tristate "Data Translation DT2821 series and DT-EZ ISA card support"
358 select COMEDI_FC
359 default N
360 ---help---
361 Enable support for Data Translation DT2821 series including DT-EZ
362 DT2821, DT2821-F-16SE, DT2821-F-8DI, DT2821-G-16SE, DT2821-G-8DI,
363 DT2823 (dt2823), DT2824-PGH, DT2824-PGL, DT2825, DT2827, DT2828,
364 DT21-EZ, DT23-EZ, DT24-EZ and DT24-EZ-PGL
365
366 To compile this driver as a module, choose M here: the module will be
367 called dt282x.
368
369config COMEDI_DMM32AT
370 tristate "Diamond Systems MM-32-AT PC/104 board support"
371 default N
372 ---help---
373 Enable support for Diamond Systems MM-32-AT PC/104 boards
374
375 To compile this driver as a module, choose M here: the module will be
376 called dmm32at.
377
378config COMEDI_FL512
379 tristate "FL512 ISA card support"
380 default N
381 ---help---
382 Enable support for FL512 ISA card
383
384 To compile this driver as a module, choose M here: the module will be
385 called fl512.
386
387config COMEDI_AIO_AIO12_8
388 tristate "I/O Products PC/104 AIO12-8 Analog I/O Board support"
389 default N
390 ---help---
391 Enable support for I/O Products PC/104 AIO12-8 Analog I/O Board
392
393 To compile this driver as a module, choose M here: the module will be
394 called aio_aio12_8.
395
396config COMEDI_AIO_IIRO_16
397 tristate "I/O Products PC/104 IIRO16 Board support"
398 default N
399 ---help---
400 Enable support for I/O Products PC/104 IIRO16 Relay And Isolated
401 Input Board
402
403 To compile this driver as a module, choose M here: the module will be
404 called aio_iiro_16.
405
406config COMEDI_C6XDIGIO
407 tristate "Mechatronic Systems Inc. C6x_DIGIO DSP daughter card support"
408 default N
409 ---help---
410 Enable support for Mechatronic Systems Inc. C6x_DIGIO DSP daughter
411 card
412
413 To compile this driver as a module, choose M here: the module will be
414 called c6xdigio.
415
416config COMEDI_MPC624
417 tristate "Micro/sys MPC-624 PC/104 board support"
418 default N
419 ---help---
420 Enable support for Micro/sys MPC-624 PC/104 board
421
422 To compile this driver as a module, choose M here: the module will be
423 called mpc624.
424
425config COMEDI_ADQ12B
426 tristate "MicroAxial ADQ12-B data acquisition and control card support"
427 default N
428 ---help---
429 Enable MicroAxial ADQ12-B daq and control card support.
430
431 To compile this driver as a module, choose M here: the module will be
432 called adq12b.
433
434config COMEDI_NI_AT_A2150
435 tristate "NI AT-A2150 ISA card support"
436 depends on COMEDI_NI_COMMON
437 default N
438 ---help---
439 Enable support for National Instruments AT-A2150 cards
440
441 To compile this driver as a module, choose M here: the module will be
442 called ni_at_a2150.
443
444config COMEDI_NI_AT_AO
445 tristate "NI AT-AO-6/10 EISA card support"
446 depends on COMEDI_NI_COMMON
447 default N
448 ---help---
449 Enable support for National Instruments AT-AO-6/10 cards
450
451 To compile this driver as a module, choose M here: the module will be
452 called ni_at_ao.
453
454config COMEDI_NI_ATMIO
455 tristate "NI AT-MIO E series ISA-PNP card support"
456 depends on ISAPNP && COMEDI_NI_TIO && COMEDI_NI_COMMON
457 default N
458 ---help---
459 Enable support for National Instruments AT-MIO E series cards
460 National Instruments AT-MIO-16E-1 (ni_atmio),
461 AT-MIO-16E-2, AT-MIO-16E-10, AT-MIO-16DE-10, AT-MIO-64E-3,
462 AT-MIO-16XE-50, AT-MIO-16XE-10, AT-AI-16XE-10
463
464 To compile this driver as a module, choose M here: the module will be
465 called ni_atmio.
466
467config COMEDI_NI_ATMIO16D
468 tristate "NI AT-MIO16/AT-MIO16D series ISA-PNP card support"
469 depends on ISAPNP && COMEDI_NI_COMMON
470 default N
471 ---help---
472 Enable support for National Instruments AT-MIO16/AT-MIO16D cards.
473
474 To compile this driver as a module, choose M here: the module will be
475 called ni_atmio16d.
476
477config COMEDI_PCMAD
478 tristate "Winsystems PCM-A/D12 and PCM-A/D16 PC/104 board support"
479 default N
480 ---help---
481 Enable support for Winsystems PCM-A/D12 and PCM-A/D16 PC/104 boards.
482
483 To compile this driver as a module, choose M here: the module will be
484 called pcmad.
485
486config COMEDI_PCMDA12
487 tristate "Winsystems PCM-D/A-12 8-channel AO PC/104 board support"
488 default N
489 ---help---
490 Enable support for Winsystems PCM-D/A-12 8-channel AO PC/104 boards.
491 Note that the board is not ISA-PNP capable and thus needs the I/O
492 port comedi_config parameter.
493
494 To compile this driver as a module, choose M here: the module will be
495 called pcmda12.
496
497config COMEDI_PCMMIO
498 tristate "Winsystems PCM-MIO PC/104 board support"
499 default N
500 ---help---
501 Enable support for Winsystems PCM-MIO multifunction PC/104 boards.
502
503 To compile this driver as a module, choose M here: the module will be
504 called pcmmio.
505
506config COMEDI_PCMUIO
507 tristate "Winsystems PCM-UIO48A and PCM-UIO96A PC/104 board support"
508 default N
509 ---help---
510 Enable support for PCM-UIO48A and PCM-UIO96A PC/104 boards.
511
512 To compile this driver as a module, choose M here: the module will be
513 called pcmuio.
514
515config COMEDI_MULTIQ3
516 tristate "Quanser Consulting MultiQ-3 ISA card support"
517 default N
518 ---help---
519 Enable support for Quanser Consulting MultiQ-3 ISA cards
520
521 To compile this driver as a module, choose M here: the module will be
522 called multiq3.
523
524config COMEDI_POC
525 tristate "Generic driver for very simple devices"
526 default N
527 ---help---
528 Enable generic support for very simple / POC (Piece of Crap) boards,
529 Keithley Metrabyte DAC-02 (dac02), Advantech PCL-733 (pcl733) and
530 PCL-734 (pcl734)
531
532 To compile this driver as a module, choose M here: the module will be
533 called poc.
534
535endif # COMEDI_ISA_DRIVERS
536
537menuconfig COMEDI_PCI_DRIVERS
17 tristate "Comedi PCI drivers" 538 tristate "Comedi PCI drivers"
18 depends on COMEDI && PCI 539 depends on COMEDI && PCI
19 default N 540 default N
20 ---help--- 541 ---help---
21 Enable lots of comedi PCI drivers to be built 542 Enable comedi PCI drivers to be built
543
544 Note that the answer to this question won't directly affect the
545 kernel: saying N will just cause the configurator to skip all
546 the questions about PCI comedi drivers.
547
548if COMEDI_PCI_DRIVERS && PCI
549
550config COMEDI_ADDI_APCI_035
551 tristate "ADDI-DATA APCI_035 support"
552 default N
553 ---help---
554 Enable support for ADDI-DATA APCI_035 cards
555
556 To compile this driver as a module, choose M here: the module will be
557 called addi_apci_035.
558
559config COMEDI_ADDI_APCI_1032
560 tristate "ADDI-DATA APCI_1032 support"
561 default N
562 ---help---
563 Enable support for ADDI-DATA APCI_1032 cards
564
565 To compile this driver as a module, choose M here: the module will be
566 called addi_apci_1032.
567
568config COMEDI_ADDI_APCI_1500
569 tristate "ADDI-DATA APCI_1500 support"
570 default N
571 ---help---
572 Enable support for ADDI-DATA APCI_1500 cards
573
574 To compile this driver as a module, choose M here: the module will be
575 called addi_apci_1500.
576
577config COMEDI_ADDI_APCI_1516
578 tristate "ADDI-DATA APCI_1516 support"
579 default N
580 ---help---
581 Enable support for ADDI-DATA APCI_1516 cards
582
583 To compile this driver as a module, choose M here: the module will be
584 called addi_apci_1516.
585
586config COMEDI_ADDI_APCI_1564
587 tristate "ADDI-DATA APCI_1564 support"
588 default N
589 ---help---
590 Enable support for ADDI-DATA APCI_1564 cards
591
592 To compile this driver as a module, choose M here: the module will be
593 called addi_apci_1564.
594
595config COMEDI_ADDI_APCI_16XX
596 tristate "ADDI-DATA APCI_16xx support"
597 default N
598 ---help---
599 Enable support for ADDI-DATA APCI_16xx cards
600
601 To compile this driver as a module, choose M here: the module will be
602 called addi_apci_16xx.
603
604config COMEDI_ADDI_APCI_2016
605 tristate "ADDI-DATA APCI_2016 support"
606 default N
607 ---help---
608 Enable support for ADDI-DATA APCI_2016 cards
609
610 To compile this driver as a module, choose M here: the module will be
611 called addi_apci_2016.
612
613config COMEDI_ADDI_APCI_2032
614 tristate "ADDI-DATA APCI_2032 support"
615 default N
616 ---help---
617 Enable support for ADDI-DATA APCI_2032 cards
618
619 To compile this driver as a module, choose M here: the module will be
620 called addi_apci_2032.
621
622config COMEDI_ADDI_APCI_2200
623 tristate "ADDI-DATA APCI_2200 support"
624 default N
625 ---help---
626 Enable support for ADDI-DATA APCI_2200 cards
627
628 To compile this driver as a module, choose M here: the module will be
629 called addi_apci_2200.
630
631config COMEDI_ADDI_APCI_3001
632 tristate "ADDI-DATA APCI_3001 support"
633 select COMEDI_FC
634 default N
635 ---help---
636 Enable support for ADDI-DATA APCI_3001 cards
637
638 To compile this driver as a module, choose M here: the module will be
639 called addi_apci_3001.
640
641config COMEDI_ADDI_APCI_3120
642 tristate "ADDI-DATA APCI_3520 support"
643 select COMEDI_FC
644 default N
645 ---help---
646 Enable support for ADDI-DATA APCI_3520 cards
647
648 To compile this driver as a module, choose M here: the module will be
649 called addi_apci_3120.
650
651config COMEDI_ADDI_APCI_3501
652 tristate "ADDI-DATA APCI_3501 support"
653 default N
654 ---help---
655 Enable support for ADDI-DATA APCI_3501 cards
656
657 To compile this driver as a module, choose M here: the module will be
658 called addi_apci_3501.
659
660config COMEDI_ADDI_APCI_3XXX
661 tristate "ADDI-DATA APCI_3xxx support"
662 default N
663 ---help---
664 Enable support for ADDI-DATA APCI_3xxx cards
665
666 To compile this driver as a module, choose M here: the module will be
667 called addi_apci_3xxx.
668
669config COMEDI_ADL_PCI6208
670 tristate "ADLink PCI-6208A support"
671 default N
672 ---help---
673 Enable support for ADLink PCI-6208A cards
674
675 To compile this driver as a module, choose M here: the module will be
676 called adl_pci6208.
677
678config COMEDI_ADL_PCI7230
679 tristate "ADLink PCI-7230 digital io board support"
680 default N
681 ---help---
682 Enable support for ADlink PCI-7230 digital io board support
683
684 To compile this driver as a module, choose M here: the module will be
685 called adl_pci7230.
686
687config COMEDI_ADL_PCI7296
688 tristate "ADLink PCI-7296 96 ch. digital io board support"
689 default N
690 ---help---
691 Enable support for ADlink PCI-7296 96 ch. digital io board support
692
693 To compile this driver as a module, choose M here: the module will be
694 called adl_pci7296.
695
696config COMEDI_ADL_PCI7432
697 tristate "ADLink PCI-7432 64 ch. isolated digital io board support"
698 default N
699 ---help---
700 Enable support for ADlink PCI-7432 64 ch. isolated digital io board
701
702 To compile this driver as a module, choose M here: the module will be
703 called adl_pci7432.
704
705config COMEDI_ADL_PCI8164
706 tristate "ADLink PCI-8164 4 Axes Motion Control board support"
707 default N
708 ---help---
709 Enable support for ADlink PCI-8164 4 Axes Motion Control board
710
711 To compile this driver as a module, choose M here: the module will be
712 called adl_pci8164.
713
714config COMEDI_ADL_PCI9111
715 tristate "ADLink PCI-9111HR support"
716 select COMEDI_FC
717 default N
718 ---help---
719 Enable support for ADlink PCI9111 cards
720
721 To compile this driver as a module, choose M here: the module will be
722 called adl_pci9111.
723
724config COMEDI_ADL_PCI9118
725 tristate "ADLink PCI-9118DG, PCI-9118HG, PCI-9118HR support"
726 select COMEDI_FC
727 default N
728 ---help---
729 Enable support for ADlink PCI-9118DG, PCI-9118HG, PCI-9118HR cards
730
731 To compile this driver as a module, choose M here: the module will be
732 called adl_pci9118.
733
734config COMEDI_ADV_PCI1710
735 tristate "Advantech PCI-171x, PCI-1720 and PCI-1731 support"
736 default N
737 ---help---
738 Enable support for Advantech PCI-1710, PCI-1710HG, PCI-1711,
739 PCI-1713, PCI-1720 and PCI-1731
740
741 To compile this driver as a module, choose M here: the module will be
742 called adv_pci1710.
743
744config COMEDI_ADV_PCI1723
745 tristate "Advantech PCI-1723 support"
746 default N
747 ---help---
748 Enable support for Advantech PCI-1723 cards
749
750 To compile this driver as a module, choose M here: the module will be
751 called adv_pci1723.
752
753config COMEDI_ADV_PCI_DIO
754 tristate "Advantech PCI DIO card support"
755 default N
756 ---help---
757 Enable support for Advantech PCI DIO cards
758 PCI-1730, PCI-1733, PCI-1734, PCI-1736UP, PCI-1750, PCI-1751,
759 PCI-1752, PCI-1753/E, PCI-1754, PCI-1756 and PCI-1762
760
761 To compile this driver as a module, choose M here: the module will be
762 called adv_pci_dio.
763
764config COMEDI_AMPLC_DIO200
765 tristate "Amplicon PC272E and PCI272 DIO board support"
766 default N
767 ---help---
768 Enable support for Amplicon PC272E and PCI272 DIO boards
769
770 To compile this driver as a module, choose M here: the module will be
771 called amplc_dio200.
772
773config COMEDI_AMPLC_PC236
774 tristate "Amplicon PC36AT and PCI236 DIO board support"
775 default N
776 ---help---
777 Enable support for Amplicon PC36AT and PCI236 DIO boards
778
779 To compile this driver as a module, choose M here: the module will be
780 called amplc_pc236.
781
782config COMEDI_AMPLC_PC263
783 tristate "Amplicon PC263 and PCI263 relay board support"
784 default N
785 ---help---
786 Enable support for Amplicon PC263 and PCI263 relay boards
787
788 To compile this driver as a module, choose M here: the module will be
789 called amplc_pc263.
790
791config COMEDI_AMPLC_PCI224
792 tristate "Amplicon PCI224 and PCI234 support"
793 select COMEDI_FC
794 default N
795 ---help---
796 Enable support for Amplicon PCI224 and PCI234 AO boards
797
798 To compile this driver as a module, choose M here: the module will be
799 called amplc_pci224.
800
801config COMEDI_AMPLC_PCI230
802 tristate "Amplicon PCI230 and PCI260 support"
803 default N
804 ---help---
805 Enable support for Amplicon PCI230 and PCI260 Multifunction I/O
806 boards
807
808 To compile this driver as a module, choose M here: the module will be
809 called amplc_pci230.
810
811config COMEDI_CONTEC_PCI_DIO
812 tristate "Contec PIO1616L digital I/O board support"
813 default N
814 ---help---
815 Enable support for the Contec PIO1616L digital I/O board
816
817 To compile this driver as a module, choose M here: the module will be
818 called contec_pci_dio.
819
820config COMEDI_DT3000
821 tristate "Data Translation DT3000 series support"
822 default N
823 ---help---
824 Enable support for Data Translation DT3000 series
825 DT3001, DT3001-PGL, DT3002, DT3003, DT3003-PGL, DT3004, DT3005 and
826 DT3004-200
827
828 To compile this driver as a module, choose M here: the module will be
829 called dt3000.
830
831config COMEDI_UNIOXX5
832 tristate "Fastwel UNIOxx-5 analog and digital io board support"
833 default N
834 ---help---
835 Enable support for Fastwel UNIOxx-5 (analog and digital i/o) boards
836
837 To compile this driver as a module, choose M here: the module will be
838 called unioxx5.
839
840config COMEDI_GSC_HPDI
841 tristate "General Standards PCI-HPDI32 / PMC-HPDI32 support"
842 select COMEDI_FC
843 default N
844 ---help---
845 Enable support for General Standards Corporation high speed parallel
846 digital interface rs485 boards PCI-HPDI32 and PMC-HPDI32.
847 Only receive mode works, transmit not supported.
848
849 To compile this driver as a module, choose M here: the module will be
850 called gsc_hpdi.
851
852config COMEDI_ICP_MULTI
853 tristate "Inova ICP_MULTI support"
854 default N
855 ---help---
856 Enable support for Inova ICP_MULTI card
857
858 To compile this driver as a module, choose M here: the module will be
859 called icp_multi.
860
861config COMEDI_II_PCI20KC
862 tristate "Intelligent Instruments PCI-20001C carrier support"
863 default N
864 ---help---
865 Enable support for Intelligent Instruments PCI-20001C carrier
866 PCI-20001, PCI-20006 and PCI-20341
867
868 To compile this driver as a module, choose M here: the module will be
869 called ii_pci20kc.
870
871config COMEDI_DAQBOARD2000
872 tristate "IOtech DAQboard/2000 support"
873 default N
874 ---help---
875 Enable support for the IOtech DAQboard/2000
876
877 To compile this driver as a module, choose M here: the module will be
878 called daqboard2000.
879
880config COMEDI_JR3_PCI
881 tristate "JR3/PCI force sensor board support"
882 default N
883 ---help---
884 Enable support for JR3/PCI force sensor boards
885
886 To compile this driver as a module, choose M here: the module will be
887 called jr3_pci.
888
889config COMEDI_KE_COUNTER
890 tristate "Kolter-Electronic PCI Counter 1 card support"
891 default N
892 ---help---
893 Enable support for Kolter-Electronic PCI Counter 1 cards
894
895 To compile this driver as a module, choose M here: the module will be
896 called ke_counter.
897
898config COMEDI_CB_PCIDAS64
899 tristate "MeasurementComputing PCI-DAS 64xx, 60xx, and 4020 support"
900 select COMEDI_FC
901 default N
902 ---help---
903 Enable support for ComputerBoards/MeasurementComputing PCI-DAS 64xx,
904 60xx, and 4020 series with the PLX 9080 PCI controller
905
906 To compile this driver as a module, choose M here: the module will be
907 called cb_pcidas64.
908
909config COMEDI_CB_PCIDAS
910 tristate "MeasurementComputing PCI-DAS support"
911 select COMEDI_FC
912 default N
913 ---help---
914 Enable support for ComputerBoards/MeasurementComputing PCI-DAS with
915 AMCC S5933 PCIcontroller: PCI-DAS1602/16, PCI-DAS1602/16jr,
916 PCI-DAS1602/12, PCI-DAS1200, PCI-DAS1200jr, PCI-DAS1000, PCI-DAS1001
917 and PCI_DAS1002.
918
919 To compile this driver as a module, choose M here: the module will be
920 called cb_pcidas.
921
922config COMEDI_CB_PCIDDA
923 tristate "MeasurementComputing PCI-DDA series support"
924 default N
925 ---help---
926 Enable support for ComputerBoards/MeasurementComputing PCI-DDA
927 series: PCI-DDA08/12, PCI-DDA04/12, PCI-DDA02/12, PCI-DDA08/16,
928 PCI-DDA04/16 and PCI-DDA02/16
929
930 To compile this driver as a module, choose M here: the module will be
931 called cb_pcidda.
932
933config COMEDI_CB_PCIDIO
934 tristate "MeasurementComputing PCI-DIO series support"
935 default N
936 ---help---
937 Enable support for ComputerBoards/MeasurementComputing PCI-DIO series
938 PCI-DIO24, PCI-DIO24H and PCI-DIO48H
939
940 To compile this driver as a module, choose M here: the module will be
941 called cb_pcidio.
942
943config COMEDI_CB_PCIMDAS
944 tristate "MeasurementComputing PCIM-DAS1602/16 support"
945 default N
946 ---help---
947 Enable support for ComputerBoards/MeasurementComputing PCI Migration
948 series PCIM-DAS1602/16
949
950 To compile this driver as a module, choose M here: the module will be
951 called cb_pcimdas.
22 952
23config COMEDI_PCMCIA_DRIVERS 953config COMEDI_CB_PCIMDDA
954 tristate "MeasurementComputing PCIM-DDA06-16 support"
955 default N
956 ---help---
957 Enable support for ComputerBoards/MeasurementComputing PCIM-DDA06-16
958
959 To compile this driver as a module, choose M here: the module will be
960 called cb_pcimdda.
961
962config COMEDI_ME4000
963 tristate "Meilhaus ME-4000 support"
964 default N
965 ---help---
966 Enable support for Meilhaus PCI data acquisition cards
967 ME-4650, ME-4670i, ME-4680, ME-4680i and ME-4680is
968
969 To compile this driver as a module, choose M here: the module will be
970 called me4000.
971
972config COMEDI_ME_DAQ
973 tristate "Meilhaus ME-2000i, ME-2600i, ME-3000vm1 support"
974 default N
975 ---help---
976 Enable support for Meilhaus PCI data acquisition cards
977 ME-2000i, ME-2600i and ME-3000vm1
978
979 To compile this driver as a module, choose M here: the module will be
980 called me_daq.
981
982config COMEDI_NI_6527
983 tristate "NI 6527 support"
984 depends on COMEDI_MITE
985 default N
986 ---help---
987 Enable support for the National Instruments 6527 PCI card
988
989 To compile this driver as a module, choose M here: the module will be
990 called ni_6527.
991
992config COMEDI_NI_65XX
993 tristate "NI 65xx static dio PCI card support"
994 depends on COMEDI_MITE
995 default N
996 ---help---
997 Enable support for National Instruments 65xx static dio boards.
998 Supported devices: National Instruments PCI-6509 (ni_65xx),
999 PXI-6509, PCI-6510, PCI-6511, PXI-6511, PCI-6512, PXI-6512, PCI-6513,
1000 PXI-6513, PCI-6514, PXI-6514, PCI-6515, PXI-6515, PCI-6516, PCI-6517,
1001 PCI-6518, PCI-6519, PCI-6520, PCI-6521, PXI-6521, PCI-6528, PXI-6528
1002
1003 To compile this driver as a module, choose M here: the module will be
1004 called ni_65xx.
1005
1006config COMEDI_NI_660X
1007 tristate "NI 660x counter/timer PCI card support"
1008 depends on COMEDI_NI_TIO && COMEDI_NI_COMMON
1009 default N
1010 ---help---
1011 Enable support for National Instruments PCI-6601 (ni_660x), PCI-6602,
1012 PXI-6602 and PXI-6608.
1013
1014 To compile this driver as a module, choose M here: the module will be
1015 called ni_660x.
1016
1017config COMEDI_NI_670X
1018 tristate "NI 670x PCI card support"
1019 depends on COMEDI_MITE
1020 default N
1021 ---help---
1022 Enable support for National Instruments PCI-6703 and PCI-6704
1023
1024 To compile this driver as a module, choose M here: the module will be
1025 called ni_670x.
1026
1027config COMEDI_NI_PCIDIO
1028 tristate "NI PCI-DIO32HS, PCI-DIO96, PCI-6533, PCI-6503 support"
1029 depends on COMEDI_MITE
1030 default N
1031 ---help---
1032 Enable support for National Instruments PCI-DIO-32HS, PXI-6533,
1033 PCI-DIO-96, PCI-DIO-96B, PXI-6508, PCI-6503, PCI-6503B, PCI-6503X,
1034 PXI-6503, PCI-6533 and PCI-6534
1035 The DIO-96 appears as four 8255 subdevices. See the 8255
1036 driver notes for details.
1037
1038 To compile this driver as a module, choose M here: the module will be
1039 called ni_pcidio.
1040
1041config COMEDI_NI_PCIMIO
1042 tristate "NI PCI-MIO-E series and M series support"
1043 depends on COMEDI_NI_TIO && COMEDI_NI_COMMON
1044 default N
1045 ---help---
1046 Enable support for National Instruments PCI-MIO-E series and M series
1047 (all boards): PCI-MIO-16XE-10, PXI-6030E, PCI-MIO-16E-1,
1048 PCI-MIO-16E-4, PCI-6014, PCI-6040E, PXI-6040E, PCI-6030E, PCI-6031E,
1049 PCI-6032E, PCI-6033E, PCI-6071E, PCI-6023E, PCI-6024E, PCI-6025E,
1050 PXI-6025E, PCI-6034E, PCI-6035E, PCI-6052E, PCI-6110, PCI-6111,
1051 PCI-6220, PCI-6221, PCI-6224, PXI-6224, PCI-6225, PXI-6225, PCI-6229,
1052 PCI-6250, PCI-6251, PCIe-6251, PCI-6254, PCI-6259, PCIe-6259,
1053 PCI-6280, PCI-6281, PXI-6281, PCI-6284, PCI-6289, PCI-6711, PXI-6711,
1054 PCI-6713, PXI-6713, PXI-6071E, PCI-6070E, PXI-6070E, PXI-6052E,
1055 PCI-6036E, PCI-6731, PCI-6733, PXI-6733, PCI-6143, PXI-6143
1056
1057 To compile this driver as a module, choose M here: the module will be
1058 called ni_pcimio.
1059
1060config COMEDI_RTD520
1061 tristate "Real Time Devices PCI4520/DM7520 support"
1062 default N
1063 ---help---
1064 Enable support for Real Time Devices PCI4520/DM7520
1065
1066 To compile this driver as a module, choose M here: the module will be
1067 called rtd520.
1068
1069config COMEDI_S526
1070 tristate "Sensoray s526 support"
1071 default N
1072 ---help---
1073 Enable support for Sensoray s526
1074
1075 To compile this driver as a module, choose M here: the module will be
1076 called s526.
1077
1078config COMEDI_S626
1079 tristate "Sensoray 626 support"
1080 select COMEDI_FC
1081 default N
1082 ---help---
1083 Enable support for Sensoray 626
1084
1085 To compile this driver as a module, choose M here: the module will be
1086 called s626.
1087
1088config COMEDI_SSV_DNP
1089 tristate "SSV Embedded Systems DIL/Net-PC support"
1090 default N
1091 ---help---
1092 Enable support for SSV Embedded Systems DIL/Net-PC
1093
1094 To compile this driver as a module, choose M here: the module will be
1095 called ssv_dnp.
1096
1097endif # COMEDI_PCI_DRIVERS
1098
1099menuconfig COMEDI_PCMCIA_DRIVERS
24 tristate "Comedi PCMCIA drivers" 1100 tristate "Comedi PCMCIA drivers"
25 depends on COMEDI && PCMCIA && PCCARD 1101 depends on COMEDI && PCMCIA && PCCARD
26 default N 1102 default N
27 ---help--- 1103 ---help---
28 Enable lots of comedi PCMCIA and PCCARD drivers to be built 1104 Enable comedi PCMCIA and PCCARD drivers to be built
1105
1106 Note that the answer to this question won't directly affect the
1107 kernel: saying N will just cause the configurator to skip all
1108 the questions about PCMCIA comedi drivers.
1109
1110if COMEDI_PCMCIA_DRIVERS && PCMCIA
1111
1112config COMEDI_CB_DAS16_CS
1113 tristate "CB DAS16 series PCMCIA support"
1114 default N
1115 ---help---
1116 Enable support for the ComputerBoards/MeasurementComputing PCMCIA
1117 cards DAS16/16, PCM-DAS16D/12 and PCM-DAS16s/16
1118
1119 To compile this driver as a module, choose M here: the module will be
1120 called cb_das16_cs.
1121
1122config COMEDI_DAS08_CS
1123 tristate "CB DAS08 PCMCIA support"
1124 select COMEDI_DAS08
1125 default N
1126 ---help---
1127 Enable support for the ComputerBoards/MeasurementComputing DAS-08
1128 PCMCIA card
1129
1130 To compile this driver as a module, choose M here: the module will be
1131 called das08_cs.
29 1132
30config COMEDI_USB_DRIVERS 1133config COMEDI_NI_DAQ_700_CS
1134 tristate "NI DAQCard-700 PCMCIA support"
1135 depends on COMEDI_NI_COMMON
1136 default N
1137 ---help---
1138 Enable support for the National Instruments PCMCIA DAQCard-700 DIO
1139
1140 To compile this driver as a module, choose M here: the module will be
1141 called ni_daq_700.
1142
1143config COMEDI_NI_DAQ_DIO24_CS
1144 tristate "NI DAQ-Card DIO-24 PCMCIA support"
1145 depends on COMEDI_NI_COMMON
1146 default N
1147 ---help---
1148 Enable support for the National Instruments PCMCIA DAQ-Card DIO-24
1149
1150 To compile this driver as a module, choose M here: the module will be
1151 called ni_daq_dio24.
1152
1153config COMEDI_NI_LABPC_CS
1154 tristate "NI DAQCard-1200 PCMCIA support"
1155 depends on COMEDI_NI_LABPC
1156 default N
1157 ---help---
1158 Enable support for the National Instruments PCMCIA DAQCard-1200
1159
1160 To compile this driver as a module, choose M here: the module will be
1161 called ni_labpc_cs.
1162
1163config COMEDI_NI_MIO_CS
1164 tristate "NI DAQCard E series PCMCIA support"
1165 depends on COMEDI_NI_TIO && COMEDI_NI_COMMON
1166 default N
1167 select COMEDI_FC
1168 ---help---
1169 Enable support for the National Instruments PCMCIA DAQCard E series
1170 DAQCard-ai-16xe-50, DAQCard-ai-16e-4, DAQCard-6062E, DAQCard-6024E
1171 and DAQCard-6036E
1172
1173 To compile this driver as a module, choose M here: the module will be
1174 called ni_mio_cs.
1175
1176config COMEDI_QUATECH_DAQP_CS
1177 tristate "Quatech DAQP PCMCIA data capture card support"
1178 default N
1179 ---help---
1180 Enable support for the Quatech DAQP PCMCIA data capture cards
1181 DAQP-208 and DAQP-308
1182
1183 To compile this driver as a module, choose M here: the module will be
1184 called quatech_daqp_cs.
1185
1186endif # COMEDI_PCMCIA_DRIVERS
1187
1188menuconfig COMEDI_USB_DRIVERS
31 tristate "Comedi USB drivers" 1189 tristate "Comedi USB drivers"
32 depends on COMEDI && USB 1190 depends on COMEDI && USB
33 default N 1191 default N
34 ---help--- 1192 ---help---
35 Enable lots of comedi USB drivers to be built 1193 Enable comedi USB drivers to be built
1194
1195 Note that the answer to this question won't directly affect the
1196 kernel: saying N will just cause the configurator to skip all
1197 the questions about USB comedi drivers.
1198
1199if COMEDI_USB_DRIVERS && USB
1200
1201config COMEDI_DT9812
1202 tristate "DataTranslation DT9812 USB module support"
1203 default N
1204 ---help---
1205 Enable support for the Data Translation DT9812 USB module
1206
1207 To compile this driver as a module, choose M here: the module will be
1208 called dt9812.
1209
1210config COMEDI_USBDUX
1211 tristate "ITL USBDUX support"
1212 default N
1213 ---help---
1214 Enable support for the University of Stirling USB DAQ and INCITE
1215 Technology Limited driver
1216
1217 To compile this driver as a module, choose M here: the module will be
1218 called usbdux.
1219
1220config COMEDI_USBDUXFAST
1221 tristate "ITL USB-DUXfast support"
1222 select COMEDI_FC
1223 default N
1224 ---help---
1225 Enable support for the University of Stirling USB-DUXfast and INCITE
1226 Technology Limited driver
1227
1228 To compile this driver as a module, choose M here: the module will be
1229 called usbduxfast.
1230
1231config COMEDI_VMK80XX
1232 tristate "Velleman VM110/VM140 USB Board support"
1233 default N
1234 ---help---
1235 Build the Velleman USB Board Low-Level Driver supporting the
1236 K8055/K8061 aka VM110/VM140 devices
1237
1238 To compile this driver as a module, choose M here: the module will be
1239 called vmk80xx.
1240
1241endif # COMEDI_USB_DRIVERS
1242
1243menuconfig COMEDI_NI_COMMON
1244 tristate "Comedi National Instruments card support"
1245 depends on COMEDI
1246 default N
1247 ---help---
1248 Enable comedi support for National Instruments cards.
1249 Modules in this section are used by many comedi NI drivers.
1250
1251 Note that the answer to this question won't directly affect the
1252 kernel: saying N will just cause the configurator to skip all
1253 the questions about National Instruments cards.
1254
1255if COMEDI_NI_COMMON
1256
1257config COMEDI_MITE
1258 tristate "NI Mite PCI interface chip support"
1259 depends on PCI
1260 default N
1261 ---help---
1262 Enable support for National Instruments Mite PCI interface chip
1263
1264 To compile this driver as a module, choose M here: the module will be
1265 called mite.
1266
1267config COMEDI_NI_TIO
1268 tristate "NI general purpose counter support"
1269 depends on COMEDI_MITE
1270 default N
1271 ---help---
1272 Enable support for National Instruments general purpose counters.
1273 This module is not used directly by end-users. Rather, it
1274 is used by other drivers (for example ni_660x and ni_pcimio)
1275 to provide support for NI's general purpose counters.
1276
1277 To compile this driver as a modules, choose M here: two modules will
1278 be build: ni_tio and ni_tiocmd.
1279
1280config COMEDI_NI_LABPC
1281 tristate "NI Lab-PC and compatibles ISA and PCI support"
1282 select COMEDI_FC
1283 default N
1284 ---help---
1285 Enable support for National Instruments Lab-PC and compatibles
1286 Lab-PC-1200, Lab-PC-1200AI, Lab-PC+ and PCI-1200.
1287 Kernel-level ISA plug-and-play support for the lab-pc-1200 boards has
1288 not yet been added to the driver.
1289
1290 To compile this driver as a module, choose M here: the module will be
1291 called ni_labpc.
1292
1293endif # COMEDI_NI_COMMON
1294
1295config COMEDI_FC
1296 tristate "Comedi shared functions for low-level driver support"
1297 default N
1298 ---help---
1299 Enable support for shared functions for low-level drivers.
1300 This module is not used directly by end-users. Rather, it
1301 is used by many other comedi drivers.
1302
1303 To compile this driver as a module, choose M here: the module will be
1304 called comedi_fc.
diff --git a/drivers/staging/comedi/drivers/Makefile b/drivers/staging/comedi/drivers/Makefile
index be995144e20d..bf1b29f7da42 100644
--- a/drivers/staging/comedi/drivers/Makefile
+++ b/drivers/staging/comedi/drivers/Makefile
@@ -2,133 +2,136 @@
2# 2#
3 3
4# Comedi "helper" modules 4# Comedi "helper" modules
5obj-$(CONFIG_COMEDI) += comedi_fc.o
6obj-$(CONFIG_COMEDI) += comedi_bond.o
7obj-$(CONFIG_COMEDI) += comedi_test.o
8obj-$(CONFIG_COMEDI) += comedi_parport.o
9obj-$(CONFIG_COMEDI) += pcm_common.o 5obj-$(CONFIG_COMEDI) += pcm_common.o
10 6
7# Comedi misc drivers
8obj-$(CONFIG_COMEDI_BOND) += comedi_bond.o
9obj-$(CONFIG_COMEDI_TEST) += comedi_test.o
10obj-$(CONFIG_COMEDI_PARPORT) += comedi_parport.o
11obj-$(CONFIG_COMEDI_SERIAL2002) += serial2002.o
12obj-$(CONFIG_COMEDI_SKEL) += skel.o
13
14# Comedi ISA drivers
15obj-$(CONFIG_COMEDI_8255) += 8255.o
16obj-$(CONFIG_COMEDI_ACL7225B) += acl7225b.o
17obj-$(CONFIG_COMEDI_PCL711) += pcl711.o
18obj-$(CONFIG_COMEDI_PCL724) += pcl724.o
19obj-$(CONFIG_COMEDI_PCL725) += pcl725.o
20obj-$(CONFIG_COMEDI_PCL726) += pcl726.o
21obj-$(CONFIG_COMEDI_PCL730) += pcl730.o
22obj-$(CONFIG_COMEDI_PCL812) += pcl812.o
23obj-$(CONFIG_COMEDI_PCL816) += pcl816.o
24obj-$(CONFIG_COMEDI_PCL818) += pcl818.o
25obj-$(CONFIG_COMEDI_PCM3724) += pcm3724.o
26obj-$(CONFIG_COMEDI_PCM3730) += pcm3730.o
27obj-$(CONFIG_COMEDI_RTI800) += rti800.o
28obj-$(CONFIG_COMEDI_RTI802) += rti802.o
29obj-$(CONFIG_COMEDI_DAS08) += das08.o
30obj-$(CONFIG_COMEDI_DAS16M1) += das16m1.o
31obj-$(CONFIG_COMEDI_DAS16) += das16.o
32obj-$(CONFIG_COMEDI_DAS800) += das800.o
33obj-$(CONFIG_COMEDI_DAS1800) += das1800.o
34obj-$(CONFIG_COMEDI_DAS6402) += das6402.o
35obj-$(CONFIG_COMEDI_DT2801) += dt2801.o
36obj-$(CONFIG_COMEDI_DT2811) += dt2811.o
37obj-$(CONFIG_COMEDI_DT2814) += dt2814.o
38obj-$(CONFIG_COMEDI_DT2815) += dt2815.o
39obj-$(CONFIG_COMEDI_DT2817) += dt2817.o
40obj-$(CONFIG_COMEDI_DT282X) += dt282x.o
41obj-$(CONFIG_COMEDI_DMM32AT) += dmm32at.o
42obj-$(CONFIG_COMEDI_FL512) += fl512.o
43obj-$(CONFIG_COMEDI_AIO_AIO12_8) += aio_aio12_8.o
44obj-$(CONFIG_COMEDI_AIO_IIRO_16) += aio_iiro_16.o
45obj-$(CONFIG_COMEDI_C6XDIGIO) += c6xdigio.o
46obj-$(CONFIG_COMEDI_MPC624) += mpc624.o
47obj-$(CONFIG_COMEDI_ADQ12B) += adq12b.o
48obj-$(CONFIG_COMEDI_NI_AT_A2150) += ni_at_a2150.o
49obj-$(CONFIG_COMEDI_NI_AT_AO) += ni_at_ao.o
50obj-$(CONFIG_COMEDI_NI_ATMIO) += ni_atmio.o
51obj-$(CONFIG_COMEDI_NI_ATMIO16D) += ni_atmio16d.o
52obj-$(CONFIG_COMEDI_PCMAD) += pcmad.o
53obj-$(CONFIG_COMEDI_PCMDA12) += pcmda12.o
54obj-$(CONFIG_COMEDI_PCMMIO) += pcmmio.o
55obj-$(CONFIG_COMEDI_PCMUIO) += pcmuio.o
56obj-$(CONFIG_COMEDI_MULTIQ3) += multiq3.o
57obj-$(CONFIG_COMEDI_POC) += poc.o
58
11# Comedi PCI drivers 59# Comedi PCI drivers
12obj-$(CONFIG_COMEDI_PCI_DRIVERS) += 8255.o 60obj-$(CONFIG_COMEDI_ADDI_APCI_035) += addi_apci_035.o
13obj-$(CONFIG_COMEDI_PCI_DRIVERS) += acl7225b.o 61obj-$(CONFIG_COMEDI_ADDI_APCI_1032) += addi_apci_1032.o
14obj-$(CONFIG_COMEDI_PCI_DRIVERS) += addi_apci_035.o 62obj-$(CONFIG_COMEDI_ADDI_APCI_1500) += addi_apci_1500.o
15obj-$(CONFIG_COMEDI_PCI_DRIVERS) += addi_apci_1032.o 63obj-$(CONFIG_COMEDI_ADDI_APCI_1516) += addi_apci_1516.o
16obj-$(CONFIG_COMEDI_PCI_DRIVERS) += addi_apci_1500.o 64obj-$(CONFIG_COMEDI_ADDI_APCI_1564) += addi_apci_1564.o
17obj-$(CONFIG_COMEDI_PCI_DRIVERS) += addi_apci_1516.o 65obj-$(CONFIG_COMEDI_ADDI_APCI_16XX) += addi_apci_16xx.o
18obj-$(CONFIG_COMEDI_PCI_DRIVERS) += addi_apci_1564.o 66obj-$(CONFIG_COMEDI_ADDI_APCI_2016) += addi_apci_2016.o
19obj-$(CONFIG_COMEDI_PCI_DRIVERS) += addi_apci_16xx.o 67obj-$(CONFIG_COMEDI_ADDI_APCI_2032) += addi_apci_2032.o
20obj-$(CONFIG_COMEDI_PCI_DRIVERS) += addi_apci_2016.o 68obj-$(CONFIG_COMEDI_ADDI_APCI_2200) += addi_apci_2200.o
21obj-$(CONFIG_COMEDI_PCI_DRIVERS) += addi_apci_2032.o 69obj-$(CONFIG_COMEDI_ADDI_APCI_3001) += addi_apci_3001.o
22obj-$(CONFIG_COMEDI_PCI_DRIVERS) += addi_apci_2200.o 70obj-$(CONFIG_COMEDI_ADDI_APCI_3120) += addi_apci_3120.o
23obj-$(CONFIG_COMEDI_PCI_DRIVERS) += addi_apci_3001.o 71obj-$(CONFIG_COMEDI_ADDI_APCI_3501) += addi_apci_3501.o
24obj-$(CONFIG_COMEDI_PCI_DRIVERS) += addi_apci_3120.o 72obj-$(CONFIG_COMEDI_ADDI_APCI_3XXX) += addi_apci_3xxx.o
25obj-$(CONFIG_COMEDI_PCI_DRIVERS) += addi_apci_3501.o 73obj-$(CONFIG_COMEDI_ADL_PCI6208) += adl_pci6208.o
26obj-$(CONFIG_COMEDI_PCI_DRIVERS) += addi_apci_3xxx.o 74obj-$(CONFIG_COMEDI_ADL_PCI7230) += adl_pci7230.o
27obj-$(CONFIG_COMEDI_PCI_DRIVERS) += adl_pci6208.o 75obj-$(CONFIG_COMEDI_ADL_PCI7296) += adl_pci7296.o
28obj-$(CONFIG_COMEDI_PCI_DRIVERS) += adl_pci7230.o 76obj-$(CONFIG_COMEDI_ADL_PCI7432) += adl_pci7432.o
29obj-$(CONFIG_COMEDI_PCI_DRIVERS) += adl_pci7296.o 77obj-$(CONFIG_COMEDI_ADL_PCI8164) += adl_pci8164.o
30obj-$(CONFIG_COMEDI_PCI_DRIVERS) += adl_pci7432.o 78obj-$(CONFIG_COMEDI_ADL_PCI9111) += adl_pci9111.o
31obj-$(CONFIG_COMEDI_PCI_DRIVERS) += adl_pci8164.o 79obj-$(CONFIG_COMEDI_ADL_PCI9118) += adl_pci9118.o
32obj-$(CONFIG_COMEDI_PCI_DRIVERS) += adl_pci9111.o 80obj-$(CONFIG_COMEDI_ADV_PCI1710) += adv_pci1710.o
33obj-$(CONFIG_COMEDI_PCI_DRIVERS) += adl_pci9118.o 81obj-$(CONFIG_COMEDI_ADV_PCI1723) += adv_pci1723.o
34obj-$(CONFIG_COMEDI_PCI_DRIVERS) += adq12b.o 82obj-$(CONFIG_COMEDI_ADV_PCI_DIO) += adv_pci_dio.o
35obj-$(CONFIG_COMEDI_PCI_DRIVERS) += adv_pci1710.o 83obj-$(CONFIG_COMEDI_AMPLC_DIO200) += amplc_dio200.o
36obj-$(CONFIG_COMEDI_PCI_DRIVERS) += adv_pci1723.o 84obj-$(CONFIG_COMEDI_AMPLC_PC236) += amplc_pc236.o
37obj-$(CONFIG_COMEDI_PCI_DRIVERS) += adv_pci_dio.o 85obj-$(CONFIG_COMEDI_AMPLC_PC263) += amplc_pc263.o
38obj-$(CONFIG_COMEDI_PCI_DRIVERS) += aio_aio12_8.o 86obj-$(CONFIG_COMEDI_AMPLC_PCI224) += amplc_pci224.o
39obj-$(CONFIG_COMEDI_PCI_DRIVERS) += aio_iiro_16.o 87obj-$(CONFIG_COMEDI_AMPLC_PCI230) += amplc_pci230.o
40obj-$(CONFIG_COMEDI_PCI_DRIVERS) += amplc_dio200.o 88obj-$(CONFIG_COMEDI_CONTEC_PCI_DIO) += contec_pci_dio.o
41obj-$(CONFIG_COMEDI_PCI_DRIVERS) += amplc_pc236.o 89obj-$(CONFIG_COMEDI_DT3000) += dt3000.o
42obj-$(CONFIG_COMEDI_PCI_DRIVERS) += amplc_pc263.o 90obj-$(CONFIG_COMEDI_UNIOXX5) += unioxx5.o
43obj-$(CONFIG_COMEDI_PCI_DRIVERS) += amplc_pci224.o 91obj-$(CONFIG_COMEDI_GSC_HPDI) += gsc_hpdi.o
44obj-$(CONFIG_COMEDI_PCI_DRIVERS) += amplc_pci230.o 92obj-$(CONFIG_COMEDI_ICP_MULTI) += icp_multi.o
45obj-$(CONFIG_COMEDI_PCI_DRIVERS) += c6xdigio.o 93obj-$(CONFIG_COMEDI_II_PCI20KC) += ii_pci20kc.o
46obj-$(CONFIG_COMEDI_PCI_DRIVERS) += cb_pcidas64.o 94obj-$(CONFIG_COMEDI_DAQBOARD2000) += daqboard2000.o
47obj-$(CONFIG_COMEDI_PCI_DRIVERS) += cb_pcidas.o 95obj-$(CONFIG_COMEDI_JR3_PCI) += jr3_pci.o
48obj-$(CONFIG_COMEDI_PCI_DRIVERS) += cb_pcidda.o 96obj-$(CONFIG_COMEDI_KE_COUNTER) += ke_counter.o
49obj-$(CONFIG_COMEDI_PCI_DRIVERS) += cb_pcidio.o 97obj-$(CONFIG_COMEDI_CB_PCIDAS64) += cb_pcidas64.o
50obj-$(CONFIG_COMEDI_PCI_DRIVERS) += cb_pcimdas.o 98obj-$(CONFIG_COMEDI_CB_PCIDAS) += cb_pcidas.o
51obj-$(CONFIG_COMEDI_PCI_DRIVERS) += cb_pcimdda.o 99obj-$(CONFIG_COMEDI_CB_PCIDDA) += cb_pcidda.o
52obj-$(CONFIG_COMEDI_PCI_DRIVERS) += comedi_bond.o 100obj-$(CONFIG_COMEDI_CB_PCIDIO) += cb_pcidio.o
53obj-$(CONFIG_COMEDI_PCI_DRIVERS) += comedi_parport.o 101obj-$(CONFIG_COMEDI_CB_PCIMDAS) += cb_pcimdas.o
54obj-$(CONFIG_COMEDI_PCI_DRIVERS) += comedi_test.o 102obj-$(CONFIG_COMEDI_CB_PCIMDDA) += cb_pcimdda.o
55obj-$(CONFIG_COMEDI_PCI_DRIVERS) += contec_pci_dio.o 103obj-$(CONFIG_COMEDI_ME4000) += me4000.o
56obj-$(CONFIG_COMEDI_PCI_DRIVERS) += daqboard2000.o 104obj-$(CONFIG_COMEDI_ME_DAQ) += me_daq.o
57obj-$(CONFIG_COMEDI_PCI_DRIVERS) += das08.o 105obj-$(CONFIG_COMEDI_NI_6527) += ni_6527.o
58obj-$(CONFIG_COMEDI_PCI_DRIVERS) += das16m1.o 106obj-$(CONFIG_COMEDI_NI_65XX) += ni_65xx.o
59obj-$(CONFIG_COMEDI_PCI_DRIVERS) += das16.o 107obj-$(CONFIG_COMEDI_NI_660X) += ni_660x.o
60obj-$(CONFIG_COMEDI_PCI_DRIVERS) += das1800.o 108obj-$(CONFIG_COMEDI_NI_670X) += ni_670x.o
61obj-$(CONFIG_COMEDI_PCI_DRIVERS) += das6402.o 109obj-$(CONFIG_COMEDI_NI_PCIDIO) += ni_pcidio.o
62obj-$(CONFIG_COMEDI_PCI_DRIVERS) += das800.o 110obj-$(CONFIG_COMEDI_NI_PCIMIO) += ni_pcimio.o
63obj-$(CONFIG_COMEDI_PCI_DRIVERS) += dmm32at.o 111obj-$(CONFIG_COMEDI_RTD520) += rtd520.o
64obj-$(CONFIG_COMEDI_PCI_DRIVERS) += dt2801.o 112obj-$(CONFIG_COMEDI_S526) += s526.o
65obj-$(CONFIG_COMEDI_PCI_DRIVERS) += dt2811.o 113obj-$(CONFIG_COMEDI_S626) += s626.o
66obj-$(CONFIG_COMEDI_PCI_DRIVERS) += dt2814.o 114obj-$(CONFIG_COMEDI_SSV_DNP) += ssv_dnp.o
67obj-$(CONFIG_COMEDI_PCI_DRIVERS) += dt2815.o
68obj-$(CONFIG_COMEDI_PCI_DRIVERS) += dt2817.o
69obj-$(CONFIG_COMEDI_PCI_DRIVERS) += dt282x.o
70obj-$(CONFIG_COMEDI_PCI_DRIVERS) += dt3000.o
71obj-$(CONFIG_COMEDI_PCI_DRIVERS) += fl512.o
72obj-$(CONFIG_COMEDI_PCI_DRIVERS) += gsc_hpdi.o
73obj-$(CONFIG_COMEDI_PCI_DRIVERS) += icp_multi.o
74obj-$(CONFIG_COMEDI_PCI_DRIVERS) += ii_pci20kc.o
75obj-$(CONFIG_COMEDI_PCI_DRIVERS) += jr3_pci.o
76obj-$(CONFIG_COMEDI_PCI_DRIVERS) += ke_counter.o
77obj-$(CONFIG_COMEDI_PCI_DRIVERS) += me4000.o
78obj-$(CONFIG_COMEDI_PCI_DRIVERS) += me_daq.o
79obj-$(CONFIG_COMEDI_PCI_DRIVERS) += mite.o
80obj-$(CONFIG_COMEDI_PCI_DRIVERS) += mpc624.o
81obj-$(CONFIG_COMEDI_PCI_DRIVERS) += multiq3.o
82obj-$(CONFIG_COMEDI_PCI_DRIVERS) += ni_6527.o
83obj-$(CONFIG_COMEDI_PCI_DRIVERS) += ni_65xx.o
84obj-$(CONFIG_COMEDI_PCI_DRIVERS) += ni_660x.o
85obj-$(CONFIG_COMEDI_PCI_DRIVERS) += ni_670x.o
86obj-$(CONFIG_COMEDI_PCI_DRIVERS) += ni_at_a2150.o
87obj-$(CONFIG_COMEDI_PCI_DRIVERS) += ni_at_ao.o
88obj-$(CONFIG_COMEDI_PCI_DRIVERS) += ni_atmio16d.o
89obj-$(CONFIG_COMEDI_PCI_DRIVERS) += ni_atmio.o
90obj-$(CONFIG_COMEDI_PCI_DRIVERS) += ni_labpc.o
91obj-$(CONFIG_COMEDI_PCI_DRIVERS) += ni_pcidio.o
92obj-$(CONFIG_COMEDI_PCI_DRIVERS) += ni_pcimio.o
93obj-$(CONFIG_COMEDI_PCI_DRIVERS) += ni_tiocmd.o
94obj-$(CONFIG_COMEDI_PCI_DRIVERS) += ni_tio.o
95obj-$(CONFIG_COMEDI_PCI_DRIVERS) += pcl711.o
96obj-$(CONFIG_COMEDI_PCI_DRIVERS) += pcl724.o
97obj-$(CONFIG_COMEDI_PCI_DRIVERS) += pcl725.o
98obj-$(CONFIG_COMEDI_PCI_DRIVERS) += pcl726.o
99obj-$(CONFIG_COMEDI_PCI_DRIVERS) += pcl730.o
100obj-$(CONFIG_COMEDI_PCI_DRIVERS) += pcl812.o
101obj-$(CONFIG_COMEDI_PCI_DRIVERS) += pcl816.o
102obj-$(CONFIG_COMEDI_PCI_DRIVERS) += pcl818.o
103obj-$(CONFIG_COMEDI_PCI_DRIVERS) += pcm3724.o
104obj-$(CONFIG_COMEDI_PCI_DRIVERS) += pcm3730.o
105obj-$(CONFIG_COMEDI_PCI_DRIVERS) += pcmad.o
106obj-$(CONFIG_COMEDI_PCI_DRIVERS) += pcmda12.o
107obj-$(CONFIG_COMEDI_PCI_DRIVERS) += pcmmio.o
108obj-$(CONFIG_COMEDI_PCI_DRIVERS) += pcmuio.o
109obj-$(CONFIG_COMEDI_PCI_DRIVERS) += poc.o
110obj-$(CONFIG_COMEDI_PCI_DRIVERS) += rtd520.o
111obj-$(CONFIG_COMEDI_PCI_DRIVERS) += rti800.o
112obj-$(CONFIG_COMEDI_PCI_DRIVERS) += rti802.o
113obj-$(CONFIG_COMEDI_PCI_DRIVERS) += s526.o
114obj-$(CONFIG_COMEDI_PCI_DRIVERS) += s626.o
115obj-$(CONFIG_COMEDI_PCI_DRIVERS) += serial2002.o
116obj-$(CONFIG_COMEDI_PCI_DRIVERS) += skel.o
117obj-$(CONFIG_COMEDI_PCI_DRIVERS) += ssv_dnp.o
118obj-$(CONFIG_COMEDI_PCI_DRIVERS) += unioxx5.o
119 115
120# Comedi PCMCIA drivers 116# Comedi PCMCIA drivers
121obj-$(CONFIG_COMEDI_PCMCIA_DRIVERS) += cb_das16_cs.o 117obj-$(CONFIG_COMEDI_CB_DAS16_CS) += cb_das16_cs.o
122obj-$(CONFIG_COMEDI_PCMCIA_DRIVERS) += das08_cs.o 118obj-$(CONFIG_COMEDI_DAS08_CS) += das08_cs.o
123obj-$(CONFIG_COMEDI_PCMCIA_DRIVERS) += ni_daq_700.o 119obj-$(CONFIG_COMEDI_NI_DAQ_700_CS) += ni_daq_700.o
124obj-$(CONFIG_COMEDI_PCMCIA_DRIVERS) += ni_daq_dio24.o 120obj-$(CONFIG_COMEDI_NI_DAQ_DIO24_CS) += ni_daq_dio24.o
125obj-$(CONFIG_COMEDI_PCMCIA_DRIVERS) += ni_labpc_cs.o 121obj-$(CONFIG_COMEDI_NI_LABPC_CS) += ni_labpc_cs.o
126obj-$(CONFIG_COMEDI_PCMCIA_DRIVERS) += ni_mio_cs.o 122obj-$(CONFIG_COMEDI_NI_MIO_CS) += ni_mio_cs.o
127obj-$(CONFIG_COMEDI_PCMCIA_DRIVERS) += quatech_daqp_cs.o 123obj-$(CONFIG_COMEDI_QUATECH_DAQP_CS) += quatech_daqp_cs.o
128 124
129# Comedi USB drivers 125# Comedi USB drivers
130obj-$(CONFIG_COMEDI_USB_DRIVERS) += dt9812.o 126obj-$(CONFIG_COMEDI_DT9812) += dt9812.o
131obj-$(CONFIG_COMEDI_USB_DRIVERS) += usbdux.o 127obj-$(CONFIG_COMEDI_USBDUX) += usbdux.o
132obj-$(CONFIG_COMEDI_USB_DRIVERS) += usbduxfast.o 128obj-$(CONFIG_COMEDI_USBDUXFAST) += usbduxfast.o
133obj-$(CONFIG_COMEDI_USB_DRIVERS) += vmk80xx.o 129obj-$(CONFIG_COMEDI_VMK80XX) += vmk80xx.o
130
131# Comedi NI drivers
132obj-$(CONFIG_COMEDI_MITE) += mite.o
133obj-$(CONFIG_COMEDI_NI_TIO) += ni_tio.o
134obj-$(CONFIG_COMEDI_NI_TIO) += ni_tiocmd.o
135obj-$(CONFIG_COMEDI_NI_LABPC) += ni_labpc.o
134 136
137obj-$(CONFIG_COMEDI_FC) += comedi_fc.o
diff --git a/drivers/staging/comedi/kcomedilib/Makefile b/drivers/staging/comedi/kcomedilib/Makefile
index 5951f86a840e..18ee99bdde08 100644
--- a/drivers/staging/comedi/kcomedilib/Makefile
+++ b/drivers/staging/comedi/kcomedilib/Makefile
@@ -1,3 +1,3 @@
1obj-$(CONFIG_COMEDI) += kcomedilib.o 1obj-$(CONFIG_COMEDI_KCOMEDILIB) += kcomedilib.o
2 2
3kcomedilib-objs := kcomedilib_main.o 3kcomedilib-objs := kcomedilib_main.o