This reverts commit b5c75b68b7ded84d4c82118974ce3975a4dcaa74. The commit makes it impossible to select configuration options that depend on COMEDI_8254, COMEDI_DAS08, COMEDI_NI_LABPC, or COMEDI_AMPLC_DIO200 options due to changing 'select' directives to 'depends on' directives and there being no other way to select those codependent configuration options.
Unified · Split
| @@ -67,7 +67,6 @@ config COMEDI_TEST · 66 unmodified lines | |||
| 67 | 67 | ||
| 68 | config COMEDI_PARPORT | 68 | config COMEDI_PARPORT |
| 69 | tristate "Parallel port support" | 69 | tristate "Parallel port support" |
| 70 | depends on HAS_IOPORT | ||
| 71 | help | 70 | help |
| 72 | Enable support for the standard parallel port. | 71 | Enable support for the standard parallel port. |
| 73 | A cheap and easy way to get a few more digital I/O lines. Steal | 72 | A cheap and easy way to get a few more digital I/O lines. Steal |
| @@ -80,7 +79,6 @@ config COMEDI_PARPORT · 6 unmodified lines | |||
| 80 | config COMEDI_SSV_DNP | 79 | config COMEDI_SSV_DNP |
| 81 | tristate "SSV Embedded Systems DIL/Net-PC support" | 80 | tristate "SSV Embedded Systems DIL/Net-PC support" |
| 82 | depends on X86_32 || COMPILE_TEST | 81 | depends on X86_32 || COMPILE_TEST |
| 83 | depends on HAS_IOPORT | ||
| 84 | help | 82 | help |
| 85 | Enable support for SSV Embedded Systems DIL/Net-PC | 83 | Enable support for SSV Embedded Systems DIL/Net-PC |
| 86 | 84 | ||
| @@ -91,7 +89,6 @@ endif # COMEDI_MISC_DRIVERS · 4 unmodified lines | |||
| 91 | 89 | ||
| 92 | menuconfig COMEDI_ISA_DRIVERS | 90 | menuconfig COMEDI_ISA_DRIVERS |
| 93 | bool "Comedi ISA and PC/104 drivers" | 91 | bool "Comedi ISA and PC/104 drivers" |
| 94 | depends on ISA | ||
| 95 | help | 92 | help |
| 96 | Enable comedi ISA and PC/104 drivers to be built | 93 | Enable comedi ISA and PC/104 drivers to be built |
| 97 | 94 | ||
| @@ -103,8 +100,7 @@ if COMEDI_ISA_DRIVERS · 5 unmodified lines | |||
| 103 | 100 | ||
| 104 | config COMEDI_PCL711 | 101 | config COMEDI_PCL711 |
| 105 | tristate "Advantech PCL-711/711b and ADlink ACL-8112 ISA card support" | 102 | tristate "Advantech PCL-711/711b and ADlink ACL-8112 ISA card support" |
| 106 | depends on HAS_IOPORT | 103 | select COMEDI_8254 |
| 107 | depends on COMEDI_8254 | ||
| 108 | help | 104 | help |
| 109 | Enable support for Advantech PCL-711 and 711b, ADlink ACL-8112 | 105 | Enable support for Advantech PCL-711 and 711b, ADlink ACL-8112 |
| 110 | 106 | ||
| @@ -165,9 +161,8 @@ config COMEDI_PCL730 · 54 unmodified lines | |||
| 165 | 161 | ||
| 166 | config COMEDI_PCL812 | 162 | config COMEDI_PCL812 |
| 167 | tristate "Advantech PCL-812/813 and ADlink ACL-8112/8113/8113/8216" | 163 | tristate "Advantech PCL-812/813 and ADlink ACL-8112/8113/8113/8216" |
| 168 | depends on HAS_IOPORT | ||
| 169 | select COMEDI_ISADMA if ISA_DMA_API | 164 | select COMEDI_ISADMA if ISA_DMA_API |
| 170 | depends on COMEDI_8254 | 165 | select COMEDI_8254 |
| 171 | help | 166 | help |
| 172 | Enable support for Advantech PCL-812/PG, PCL-813/B, ADLink | 167 | Enable support for Advantech PCL-812/PG, PCL-813/B, ADLink |
| 173 | ACL-8112DG/HG/PG, ACL-8113, ACL-8216, ICP DAS A-821PGH/PGL/PGL-NDA, | 168 | ACL-8112DG/HG/PG, ACL-8113, ACL-8216, ICP DAS A-821PGH/PGL/PGL-NDA, |
| @@ -178,9 +173,8 @@ config COMEDI_PCL812 · 4 unmodified lines | |||
| 178 | 173 | ||
| 179 | config COMEDI_PCL816 | 174 | config COMEDI_PCL816 |
| 180 | tristate "Advantech PCL-814 and PCL-816 ISA card support" | 175 | tristate "Advantech PCL-814 and PCL-816 ISA card support" |
| 181 | depends on HAS_IOPORT | ||
| 182 | select COMEDI_ISADMA if ISA_DMA_API | 176 | select COMEDI_ISADMA if ISA_DMA_API |
| 183 | depends on COMEDI_8254 | 177 | select COMEDI_8254 |
| 184 | help | 178 | help |
| 185 | Enable support for Advantech PCL-814 and PCL-816 ISA cards | 179 | Enable support for Advantech PCL-814 and PCL-816 ISA cards |
| 186 | 180 | ||
| @@ -189,9 +183,8 @@ config COMEDI_PCL816 · 2 unmodified lines | |||
| 189 | 183 | ||
| 190 | config COMEDI_PCL818 | 184 | config COMEDI_PCL818 |
| 191 | tristate "Advantech PCL-718 and PCL-818 ISA card support" | 185 | tristate "Advantech PCL-718 and PCL-818 ISA card support" |
| 192 | depends on HAS_IOPORT | ||
| 193 | select COMEDI_ISADMA if ISA_DMA_API | 186 | select COMEDI_ISADMA if ISA_DMA_API |
| 194 | depends on COMEDI_8254 | 187 | select COMEDI_8254 |
| 195 | help | 188 | help |
| 196 | Enable support for Advantech PCL-818 ISA cards | 189 | Enable support for Advantech PCL-818 ISA cards |
| 197 | PCL-818L, PCL-818H, PCL-818HD, PCL-818HG, PCL-818 and PCL-718 | 190 | PCL-818L, PCL-818H, PCL-818HD, PCL-818HG, PCL-818 and PCL-718 |
| @@ -210,7 +203,7 @@ config COMEDI_PCM3724 · 12 unmodified lines | |||
| 210 | 203 | ||
| 211 | config COMEDI_AMPLC_DIO200_ISA | 204 | config COMEDI_AMPLC_DIO200_ISA |
| 212 | tristate "Amplicon PC212E/PC214E/PC215E/PC218E/PC272E" | 205 | tristate "Amplicon PC212E/PC214E/PC215E/PC218E/PC272E" |
| 213 | depends on COMEDI_AMPLC_DIO200 | 206 | select COMEDI_AMPLC_DIO200 |
| 214 | help | 207 | help |
| 215 | Enable support for Amplicon PC212E, PC214E, PC215E, PC218E and | 208 | Enable support for Amplicon PC212E, PC214E, PC215E, PC218E and |
| 216 | PC272E ISA DIO boards | 209 | PC272E ISA DIO boards |
| @@ -262,8 +255,7 @@ config COMEDI_DAC02 · 45 unmodified lines | |||
| 262 | 255 | ||
| 263 | config COMEDI_DAS16M1 | 256 | config COMEDI_DAS16M1 |
| 264 | tristate "MeasurementComputing CIO-DAS16/M1DAS-16 ISA card support" | 257 | tristate "MeasurementComputing CIO-DAS16/M1DAS-16 ISA card support" |
| 265 | depends on HAS_IOPORT | 258 | select COMEDI_8254 |
| 266 | depends on COMEDI_8254 | ||
| 267 | select COMEDI_8255 | 259 | select COMEDI_8255 |
| 268 | help | 260 | help |
| 269 | Enable support for Measurement Computing CIO-DAS16/M1 ISA cards. | 261 | Enable support for Measurement Computing CIO-DAS16/M1 ISA cards. |
| @@ -273,7 +265,7 @@ config COMEDI_DAS16M1 · 3 unmodified lines | |||
| 273 | 265 | ||
| 274 | config COMEDI_DAS08_ISA | 266 | config COMEDI_DAS08_ISA |
| 275 | tristate "DAS-08 compatible ISA and PC/104 card support" | 267 | tristate "DAS-08 compatible ISA and PC/104 card support" |
| 276 | depends on COMEDI_DAS08 | 268 | select COMEDI_DAS08 |
| 277 | help | 269 | help |
| 278 | Enable support for Keithley Metrabyte/ComputerBoards DAS08 | 270 | Enable support for Keithley Metrabyte/ComputerBoards DAS08 |
| 279 | and compatible ISA and PC/104 cards: | 271 | and compatible ISA and PC/104 cards: |
| @@ -286,9 +278,8 @@ config COMEDI_DAS08_ISA · 6 unmodified lines | |||
| 286 | 278 | ||
| 287 | config COMEDI_DAS16 | 279 | config COMEDI_DAS16 |
| 288 | tristate "DAS-16 compatible ISA and PC/104 card support" | 280 | tristate "DAS-16 compatible ISA and PC/104 card support" |
| 289 | depends on HAS_IOPORT | ||
| 290 | select COMEDI_ISADMA if ISA_DMA_API | 281 | select COMEDI_ISADMA if ISA_DMA_API |
| 291 | depends on COMEDI_8254 | 282 | select COMEDI_8254 |
| 292 | select COMEDI_8255 | 283 | select COMEDI_8255 |
| 293 | help | 284 | help |
| 294 | Enable support for Keithley Metrabyte/ComputerBoards DAS16 | 285 | Enable support for Keithley Metrabyte/ComputerBoards DAS16 |
| @@ -305,8 +296,7 @@ config COMEDI_DAS16 · 10 unmodified lines | |||
| 305 | 296 | ||
| 306 | config COMEDI_DAS800 | 297 | config COMEDI_DAS800 |
| 307 | tristate "DAS800 and compatible ISA card support" | 298 | tristate "DAS800 and compatible ISA card support" |
| 308 | depends on HAS_IOPORT | 299 | select COMEDI_8254 |
| 309 | depends on COMEDI_8254 | ||
| 310 | help | 300 | help |
| 311 | Enable support for Keithley Metrabyte DAS800 and compatible ISA cards | 301 | Enable support for Keithley Metrabyte DAS800 and compatible ISA cards |
| 312 | Keithley Metrabyte DAS-800, DAS-801, DAS-802 | 302 | Keithley Metrabyte DAS-800, DAS-801, DAS-802 |
| @@ -318,9 +308,8 @@ config COMEDI_DAS800 · 5 unmodified lines | |||
| 318 | 308 | ||
| 319 | config COMEDI_DAS1800 | 309 | config COMEDI_DAS1800 |
| 320 | tristate "DAS1800 and compatible ISA card support" | 310 | tristate "DAS1800 and compatible ISA card support" |
| 321 | depends on HAS_IOPORT | ||
| 322 | select COMEDI_ISADMA if ISA_DMA_API | 311 | select COMEDI_ISADMA if ISA_DMA_API |
| 323 | depends on COMEDI_8254 | 312 | select COMEDI_8254 |
| 324 | help | 313 | help |
| 325 | Enable support for DAS1800 and compatible ISA cards | 314 | Enable support for DAS1800 and compatible ISA cards |
| 326 | Keithley Metrabyte DAS-1701ST, DAS-1701ST-DA, DAS-1701/AO, | 315 | Keithley Metrabyte DAS-1701ST, DAS-1701ST-DA, DAS-1701/AO, |
| @@ -334,8 +323,7 @@ config COMEDI_DAS1800 · 7 unmodified lines | |||
| 334 | 323 | ||
| 335 | config COMEDI_DAS6402 | 324 | config COMEDI_DAS6402 |
| 336 | tristate "DAS6402 and compatible ISA card support" | 325 | tristate "DAS6402 and compatible ISA card support" |
| 337 | depends on HAS_IOPORT | 326 | select COMEDI_8254 |
| 338 | depends on COMEDI_8254 | ||
| 339 | help | 327 | help |
| 340 | Enable support for DAS6402 and compatible ISA cards | 328 | Enable support for DAS6402 and compatible ISA cards |
| 341 | Computerboards, Keithley Metrabyte DAS6402 and compatibles | 329 | Computerboards, Keithley Metrabyte DAS6402 and compatibles |
| @@ -414,8 +402,7 @@ config COMEDI_FL512 · 72 unmodified lines | |||
| 414 | 402 | ||
| 415 | config COMEDI_AIO_AIO12_8 | 403 | config COMEDI_AIO_AIO12_8 |
| 416 | tristate "I/O Products PC/104 AIO12-8 Analog I/O Board support" | 404 | tristate "I/O Products PC/104 AIO12-8 Analog I/O Board support" |
| 417 | depends on HAS_IOPORT | 405 | select COMEDI_8254 |
| 418 | depends on COMEDI_8254 | ||
| 419 | select COMEDI_8255 | 406 | select COMEDI_8255 |
| 420 | help | 407 | help |
| 421 | Enable support for I/O Products PC/104 AIO12-8 Analog I/O Board | 408 | Enable support for I/O Products PC/104 AIO12-8 Analog I/O Board |
| @@ -469,9 +456,8 @@ config COMEDI_ADQ12B · 47 unmodified lines | |||
| 469 | 456 | ||
| 470 | config COMEDI_NI_AT_A2150 | 457 | config COMEDI_NI_AT_A2150 |
| 471 | tristate "NI AT-A2150 ISA card support" | 458 | tristate "NI AT-A2150 ISA card support" |
| 472 | depends on HAS_IOPORT | ||
| 473 | select COMEDI_ISADMA if ISA_DMA_API | 459 | select COMEDI_ISADMA if ISA_DMA_API |
| 474 | depends on COMEDI_8254 | 460 | select COMEDI_8254 |
| 475 | help | 461 | help |
| 476 | Enable support for National Instruments AT-A2150 cards | 462 | Enable support for National Instruments AT-A2150 cards |
| 477 | 463 | ||
| @@ -480,8 +466,7 @@ config COMEDI_NI_AT_A2150 · 2 unmodified lines | |||
| 480 | 466 | ||
| 481 | config COMEDI_NI_AT_AO | 467 | config COMEDI_NI_AT_AO |
| 482 | tristate "NI AT-AO-6/10 EISA card support" | 468 | tristate "NI AT-AO-6/10 EISA card support" |
| 483 | depends on HAS_IOPORT | 469 | select COMEDI_8254 |
| 484 | depends on COMEDI_8254 | ||
| 485 | help | 470 | help |
| 486 | Enable support for National Instruments AT-AO-6/10 cards | 471 | Enable support for National Instruments AT-AO-6/10 cards |
| 487 | 472 | ||
| @@ -512,7 +497,7 @@ config COMEDI_NI_ATMIO16D · 24 unmodified lines | |||
| 512 | 497 | ||
| 513 | config COMEDI_NI_LABPC_ISA | 498 | config COMEDI_NI_LABPC_ISA |
| 514 | tristate "NI Lab-PC and compatibles ISA support" | 499 | tristate "NI Lab-PC and compatibles ISA support" |
| 515 | depends on COMEDI_NI_LABPC | 500 | select COMEDI_NI_LABPC |
| 516 | help | 501 | help |
| 517 | Enable support for National Instruments Lab-PC and compatibles | 502 | Enable support for National Instruments Lab-PC and compatibles |
| 518 | Lab-PC-1200, Lab-PC-1200AI, Lab-PC+. | 503 | Lab-PC-1200, Lab-PC-1200AI, Lab-PC+. |
| @@ -576,7 +561,7 @@ endif # COMEDI_ISA_DRIVERS · 57 unmodified lines | |||
| 576 | 561 | ||
| 577 | menuconfig COMEDI_PCI_DRIVERS | 562 | menuconfig COMEDI_PCI_DRIVERS |
| 578 | tristate "Comedi PCI drivers" | 563 | tristate "Comedi PCI drivers" |
| 579 | depends on PCI && HAS_IOPORT | 564 | depends on PCI |
| 580 | help | 565 | help |
| 581 | Enable support for comedi PCI drivers. | 566 | Enable support for comedi PCI drivers. |
| 582 | 567 | ||
| @@ -725,8 +710,7 @@ config COMEDI_ADL_PCI8164 · 142 unmodified lines | |||
| 725 | 710 | ||
| 726 | config COMEDI_ADL_PCI9111 | 711 | config COMEDI_ADL_PCI9111 |
| 727 | tristate "ADLink PCI-9111HR support" | 712 | tristate "ADLink PCI-9111HR support" |
| 728 | depends on HAS_IOPORT | 713 | select COMEDI_8254 |
| 729 | depends on COMEDI_8254 | ||
| 730 | help | 714 | help |
| 731 | Enable support for ADlink PCI9111 cards | 715 | Enable support for ADlink PCI9111 cards |
| 732 | 716 | ||
| @@ -736,7 +720,7 @@ config COMEDI_ADL_PCI9111 · 3 unmodified lines | |||
| 736 | config COMEDI_ADL_PCI9118 | 720 | config COMEDI_ADL_PCI9118 |
| 737 | tristate "ADLink PCI-9118DG, PCI-9118HG, PCI-9118HR support" | 721 | tristate "ADLink PCI-9118DG, PCI-9118HG, PCI-9118HR support" |
| 738 | depends on HAS_DMA | 722 | depends on HAS_DMA |
| 739 | depends on COMEDI_8254 | 723 | select COMEDI_8254 |
| 740 | help | 724 | help |
| 741 | Enable support for ADlink PCI-9118DG, PCI-9118HG, PCI-9118HR cards | 725 | Enable support for ADlink PCI-9118DG, PCI-9118HG, PCI-9118HR cards |
| 742 | 726 | ||
| @@ -745,8 +729,7 @@ config COMEDI_ADL_PCI9118 · 2 unmodified lines | |||
| 745 | 729 | ||
| 746 | config COMEDI_ADV_PCI1710 | 730 | config COMEDI_ADV_PCI1710 |
| 747 | tristate "Advantech PCI-171x and PCI-1731 support" | 731 | tristate "Advantech PCI-171x and PCI-1731 support" |
| 748 | depends on HAS_IOPORT | 732 | select COMEDI_8254 |
| 749 | depends on COMEDI_8254 | ||
| 750 | help | 733 | help |
| 751 | Enable support for Advantech PCI-1710, PCI-1710HG, PCI-1711, | 734 | Enable support for Advantech PCI-1710, PCI-1710HG, PCI-1711, |
| 752 | PCI-1713 and PCI-1731 | 735 | PCI-1713 and PCI-1731 |
| @@ -790,8 +773,7 @@ config COMEDI_ADV_PCI1760 · 37 unmodified lines | |||
| 790 | 773 | ||
| 791 | config COMEDI_ADV_PCI_DIO | 774 | config COMEDI_ADV_PCI_DIO |
| 792 | tristate "Advantech PCI DIO card support" | 775 | tristate "Advantech PCI DIO card support" |
| 793 | depends on HAS_IOPORT | 776 | select COMEDI_8254 |
| 794 | depends on COMEDI_8254 | ||
| 795 | select COMEDI_8255 | 777 | select COMEDI_8255 |
| 796 | help | 778 | help |
| 797 | Enable support for Advantech PCI DIO cards | 779 | Enable support for Advantech PCI DIO cards |
| @@ -804,7 +786,7 @@ config COMEDI_ADV_PCI_DIO · 6 unmodified lines | |||
| 804 | 786 | ||
| 805 | config COMEDI_AMPLC_DIO200_PCI | 787 | config COMEDI_AMPLC_DIO200_PCI |
| 806 | tristate "Amplicon PCI215/PCI272/PCIe215/PCIe236/PCIe296 DIO support" | 788 | tristate "Amplicon PCI215/PCI272/PCIe215/PCIe236/PCIe296 DIO support" |
| 807 | depends on COMEDI_AMPLC_DIO200 | 789 | select COMEDI_AMPLC_DIO200 |
| 808 | help | 790 | help |
| 809 | Enable support for Amplicon PCI215, PCI272, PCIe215, PCIe236 | 791 | Enable support for Amplicon PCI215, PCI272, PCIe215, PCIe236 |
| 810 | and PCIe296 DIO boards. | 792 | and PCIe296 DIO boards. |
| @@ -832,8 +814,7 @@ config COMEDI_AMPLC_PC263_PCI · 21 unmodified lines | |||
| 832 | 814 | ||
| 833 | config COMEDI_AMPLC_PCI224 | 815 | config COMEDI_AMPLC_PCI224 |
| 834 | tristate "Amplicon PCI224 and PCI234 support" | 816 | tristate "Amplicon PCI224 and PCI234 support" |
| 835 | depends on HAS_IOPORT | 817 | select COMEDI_8254 |
| 836 | depends on COMEDI_8254 | ||
| 837 | help | 818 | help |
| 838 | Enable support for Amplicon PCI224 and PCI234 AO boards | 819 | Enable support for Amplicon PCI224 and PCI234 AO boards |
| 839 | 820 | ||
| @@ -842,8 +823,7 @@ config COMEDI_AMPLC_PCI224 · 2 unmodified lines | |||
| 842 | 823 | ||
| 843 | config COMEDI_AMPLC_PCI230 | 824 | config COMEDI_AMPLC_PCI230 |
| 844 | tristate "Amplicon PCI230 and PCI260 support" | 825 | tristate "Amplicon PCI230 and PCI260 support" |
| 845 | depends on HAS_IOPORT | 826 | select COMEDI_8254 |
| 846 | depends on COMEDI_8254 | ||
| 847 | select COMEDI_8255 | 827 | select COMEDI_8255 |
| 848 | help | 828 | help |
| 849 | Enable support for Amplicon PCI230 and PCI260 Multifunction I/O | 829 | Enable support for Amplicon PCI230 and PCI260 Multifunction I/O |
| @@ -862,7 +842,7 @@ config COMEDI_CONTEC_PCI_DIO · 12 unmodified lines | |||
| 862 | 842 | ||
| 863 | config COMEDI_DAS08_PCI | 843 | config COMEDI_DAS08_PCI |
| 864 | tristate "DAS-08 PCI support" | 844 | tristate "DAS-08 PCI support" |
| 865 | depends on COMEDI_DAS08 | 845 | select COMEDI_DAS08 |
| 866 | help | 846 | help |
| 867 | Enable support for PCI DAS-08 cards. | 847 | Enable support for PCI DAS-08 cards. |
| 868 | 848 | ||
| @@ -949,8 +929,7 @@ config COMEDI_CB_PCIDAS64 · 80 unmodified lines | |||
| 949 | 929 | ||
| 950 | config COMEDI_CB_PCIDAS | 930 | config COMEDI_CB_PCIDAS |
| 951 | tristate "MeasurementComputing PCI-DAS support" | 931 | tristate "MeasurementComputing PCI-DAS support" |
| 952 | depends on HAS_IOPORT | 932 | select COMEDI_8254 |
| 953 | depends on COMEDI_8254 | ||
| 954 | select COMEDI_8255 | 933 | select COMEDI_8255 |
| 955 | help | 934 | help |
| 956 | Enable support for ComputerBoards/MeasurementComputing PCI-DAS with | 935 | Enable support for ComputerBoards/MeasurementComputing PCI-DAS with |
| @@ -974,8 +953,7 @@ config COMEDI_CB_PCIDDA · 17 unmodified lines | |||
| 974 | 953 | ||
| 975 | config COMEDI_CB_PCIMDAS | 954 | config COMEDI_CB_PCIMDAS |
| 976 | tristate "MeasurementComputing PCIM-DAS1602/16, PCIe-DAS1602/16 support" | 955 | tristate "MeasurementComputing PCIM-DAS1602/16, PCIe-DAS1602/16 support" |
| 977 | depends on HAS_IOPORT | 956 | select COMEDI_8254 |
| 978 | depends on COMEDI_8254 | ||
| 979 | select COMEDI_8255 | 957 | select COMEDI_8255 |
| 980 | help | 958 | help |
| 981 | Enable support for ComputerBoards/MeasurementComputing PCI Migration | 959 | Enable support for ComputerBoards/MeasurementComputing PCI Migration |
| @@ -995,8 +973,7 @@ config COMEDI_CB_PCIMDDA · 13 unmodified lines | |||
| 995 | 973 | ||
| 996 | config COMEDI_ME4000 | 974 | config COMEDI_ME4000 |
| 997 | tristate "Meilhaus ME-4000 support" | 975 | tristate "Meilhaus ME-4000 support" |
| 998 | depends on HAS_IOPORT | 976 | select COMEDI_8254 |
| 999 | depends on COMEDI_8254 | ||
| 1000 | help | 977 | help |
| 1001 | Enable support for Meilhaus PCI data acquisition cards | 978 | Enable support for Meilhaus PCI data acquisition cards |
| 1002 | ME-4650, ME-4670i, ME-4680, ME-4680i and ME-4680is | 979 | ME-4650, ME-4670i, ME-4680, ME-4680i and ME-4680is |
| @@ -1054,7 +1031,7 @@ config COMEDI_NI_670X · 51 unmodified lines | |||
| 1054 | 1031 | ||
| 1055 | config COMEDI_NI_LABPC_PCI | 1032 | config COMEDI_NI_LABPC_PCI |
| 1056 | tristate "NI Lab-PC PCI-1200 support" | 1033 | tristate "NI Lab-PC PCI-1200 support" |
| 1057 | depends on COMEDI_NI_LABPC | 1034 | select COMEDI_NI_LABPC |
| 1058 | help | 1035 | help |
| 1059 | Enable support for National Instruments Lab-PC PCI-1200. | 1036 | Enable support for National Instruments Lab-PC PCI-1200. |
| 1060 | 1037 | ||
| @@ -1076,7 +1053,6 @@ config COMEDI_NI_PCIDIO · 15 unmodified lines | |||
| 1076 | config COMEDI_NI_PCIMIO | 1053 | config COMEDI_NI_PCIMIO |
| 1077 | tristate "NI PCI-MIO-E series and M series support" | 1054 | tristate "NI PCI-MIO-E series and M series support" |
| 1078 | depends on HAS_DMA | 1055 | depends on HAS_DMA |
| 1079 | depends on HAS_IOPORT | ||
| 1080 | select COMEDI_NI_TIOCMD | 1056 | select COMEDI_NI_TIOCMD |
| 1081 | select COMEDI_8255 | 1057 | select COMEDI_8255 |
| 1082 | help | 1058 | help |
| @@ -1098,8 +1074,7 @@ config COMEDI_NI_PCIMIO · 15 unmodified lines | |||
| 1098 | 1074 | ||
| 1099 | config COMEDI_RTD520 | 1075 | config COMEDI_RTD520 |
| 1100 | tristate "Real Time Devices PCI4520/DM7520 support" | 1076 | tristate "Real Time Devices PCI4520/DM7520 support" |
| 1101 | depends on HAS_IOPORT | 1077 | select COMEDI_8254 |
| 1102 | depends on COMEDI_8254 | ||
| 1103 | help | 1078 | help |
| 1104 | Enable support for Real Time Devices PCI4520/DM7520 | 1079 | Enable support for Real Time Devices PCI4520/DM7520 |
| 1105 | 1080 | ||
| @@ -1139,8 +1114,7 @@ if COMEDI_PCMCIA_DRIVERS · 33 unmodified lines | |||
| 1139 | 1114 | ||
| 1140 | config COMEDI_CB_DAS16_CS | 1115 | config COMEDI_CB_DAS16_CS |
| 1141 | tristate "CB DAS16 series PCMCIA support" | 1116 | tristate "CB DAS16 series PCMCIA support" |
| 1142 | depends on HAS_IOPORT | 1117 | select COMEDI_8254 |
| 1143 | depends on COMEDI_8254 | ||
| 1144 | help | 1118 | help |
| 1145 | Enable support for the ComputerBoards/MeasurementComputing PCMCIA | 1119 | Enable support for the ComputerBoards/MeasurementComputing PCMCIA |
| 1146 | cards DAS16/16, PCM-DAS16D/12 and PCM-DAS16s/16 | 1120 | cards DAS16/16, PCM-DAS16D/12 and PCM-DAS16s/16 |
| @@ -1150,7 +1124,7 @@ config COMEDI_CB_DAS16_CS · 3 unmodified lines | |||
| 1150 | 1124 | ||
| 1151 | config COMEDI_DAS08_CS | 1125 | config COMEDI_DAS08_CS |
| 1152 | tristate "CB DAS08 PCMCIA support" | 1126 | tristate "CB DAS08 PCMCIA support" |
| 1153 | depends on COMEDI_DAS08 | 1127 | select COMEDI_DAS08 |
| 1154 | help | 1128 | help |
| 1155 | Enable support for the ComputerBoards/MeasurementComputing DAS-08 | 1129 | Enable support for the ComputerBoards/MeasurementComputing DAS-08 |
| 1156 | PCMCIA card | 1130 | PCMCIA card |
| @@ -1160,7 +1134,6 @@ config COMEDI_DAS08_CS · 3 unmodified lines | |||
| 1160 | 1134 | ||
| 1161 | config COMEDI_NI_DAQ_700_CS | 1135 | config COMEDI_NI_DAQ_700_CS |
| 1162 | tristate "NI DAQCard-700 PCMCIA support" | 1136 | tristate "NI DAQCard-700 PCMCIA support" |
| 1163 | depends on HAS_IOPORT | ||
| 1164 | help | 1137 | help |
| 1165 | Enable support for the National Instruments PCMCIA DAQCard-700 DIO | 1138 | Enable support for the National Instruments PCMCIA DAQCard-700 DIO |
| 1166 | 1139 | ||
| @@ -1169,7 +1142,6 @@ config COMEDI_NI_DAQ_700_CS · 2 unmodified lines | |||
| 1169 | 1142 | ||
| 1170 | config COMEDI_NI_DAQ_DIO24_CS | 1143 | config COMEDI_NI_DAQ_DIO24_CS |
| 1171 | tristate "NI DAQ-Card DIO-24 PCMCIA support" | 1144 | tristate "NI DAQ-Card DIO-24 PCMCIA support" |
| 1172 | depends on HAS_IOPORT | ||
| 1173 | select COMEDI_8255 | 1145 | select COMEDI_8255 |
| 1174 | help | 1146 | help |
| 1175 | Enable support for the National Instruments PCMCIA DAQ-Card DIO-24 | 1147 | Enable support for the National Instruments PCMCIA DAQ-Card DIO-24 |
| @@ -1179,7 +1151,7 @@ config COMEDI_NI_DAQ_DIO24_CS · 3 unmodified lines | |||
| 1179 | 1151 | ||
| 1180 | config COMEDI_NI_LABPC_CS | 1152 | config COMEDI_NI_LABPC_CS |
| 1181 | tristate "NI DAQCard-1200 PCMCIA support" | 1153 | tristate "NI DAQCard-1200 PCMCIA support" |
| 1182 | depends on COMEDI_NI_LABPC | 1154 | select COMEDI_NI_LABPC |
| 1183 | help | 1155 | help |
| 1184 | Enable support for the National Instruments PCMCIA DAQCard-1200 | 1156 | Enable support for the National Instruments PCMCIA DAQCard-1200 |
| 1185 | 1157 | ||
| @@ -1188,7 +1160,6 @@ config COMEDI_NI_LABPC_CS · 2 unmodified lines | |||
| 1188 | 1160 | ||
| 1189 | config COMEDI_NI_MIO_CS | 1161 | config COMEDI_NI_MIO_CS |
| 1190 | tristate "NI DAQCard E series PCMCIA support" | 1162 | tristate "NI DAQCard E series PCMCIA support" |
| 1191 | depends on HAS_IOPORT | ||
| 1192 | select COMEDI_NI_TIO | 1163 | select COMEDI_NI_TIO |
| 1193 | select COMEDI_8255 | 1164 | select COMEDI_8255 |
| 1194 | help | 1165 | help |
| @@ -1201,7 +1172,6 @@ config COMEDI_NI_MIO_CS · 6 unmodified lines | |||
| 1201 | 1172 | ||
| 1202 | config COMEDI_QUATECH_DAQP_CS | 1173 | config COMEDI_QUATECH_DAQP_CS |
| 1203 | tristate "Quatech DAQP PCMCIA data capture card support" | 1174 | tristate "Quatech DAQP PCMCIA data capture card support" |
| 1204 | depends on HAS_IOPORT | ||
| 1205 | help | 1175 | help |
| 1206 | Enable support for the Quatech DAQP PCMCIA data capture cards | 1176 | Enable support for the Quatech DAQP PCMCIA data capture cards |
| 1207 | DAQP-208 and DAQP-308 | 1177 | DAQP-208 and DAQP-308 |
| @@ -1278,14 +1248,12 @@ endif # COMEDI_USB_DRIVERS · 70 unmodified lines | |||
| 1278 | 1248 | ||
| 1279 | config COMEDI_8254 | 1249 | config COMEDI_8254 |
| 1280 | tristate | 1250 | tristate |
| 1281 | depends on HAS_IOPORT | ||
| 1282 | 1251 | ||
| 1283 | config COMEDI_8255 | 1252 | config COMEDI_8255 |
| 1284 | tristate | 1253 | tristate |
| 1285 | 1254 | ||
| 1286 | config COMEDI_8255_SA | 1255 | config COMEDI_8255_SA |
| 1287 | tristate "Standalone 8255 support" | 1256 | tristate "Standalone 8255 support" |
| 1288 | depends on HAS_IOPORT | ||
| 1289 | select COMEDI_8255 | 1257 | select COMEDI_8255 |
| 1290 | help | 1258 | help |
| 1291 | Enable support for 8255 digital I/O as a standalone driver. | 1259 | Enable support for 8255 digital I/O as a standalone driver. |
| @@ -1317,7 +1285,7 @@ config COMEDI_KCOMEDILIB · 25 unmodified lines | |||
| 1317 | called kcomedilib. | 1285 | called kcomedilib. |
| 1318 | 1286 | ||
| 1319 | config COMEDI_AMPLC_DIO200 | 1287 | config COMEDI_AMPLC_DIO200 |
| 1320 | depends on COMEDI_8254 | 1288 | select COMEDI_8254 |
| 1321 | tristate | 1289 | tristate |
| 1322 | 1290 | ||
| 1323 | config COMEDI_AMPLC_PC236 | 1291 | config COMEDI_AMPLC_PC236 |
| @@ -1326,7 +1294,7 @@ config COMEDI_AMPLC_PC236 · 2 unmodified lines | |||
| 1326 | 1294 | ||
| 1327 | config COMEDI_DAS08 | 1295 | config COMEDI_DAS08 |
| 1328 | tristate | 1296 | tristate |
| 1329 | depends on COMEDI_8254 | 1297 | select COMEDI_8254 |
| 1330 | select COMEDI_8255 | 1298 | select COMEDI_8255 |
| 1331 | 1299 | ||
| 1332 | config COMEDI_ISADMA | 1300 | config COMEDI_ISADMA |
| @@ -1334,8 +1302,7 @@ config COMEDI_ISADMA · 1 unmodified line | |||
| 1334 | 1302 | ||
| 1335 | config COMEDI_NI_LABPC | 1303 | config COMEDI_NI_LABPC |
| 1336 | tristate | 1304 | tristate |
| 1337 | depends on HAS_IOPORT | 1305 | select COMEDI_8254 |
| 1338 | depends on COMEDI_8254 | ||
| 1339 | select COMEDI_8255 | 1306 | select COMEDI_8255 |
| 1340 | 1307 | ||
| 1341 | config COMEDI_NI_LABPC_ISADMA | 1308 | config COMEDI_NI_LABPC_ISADMA |