tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

comedi: add HAS_IOPORT dependencies

In a future patch HAS_IOPORT=n will result in inb()/outb() and friends
not being declared. We thus need to add HAS_IOPORT as dependency for
those drivers using them.

Co-developed-by: Arnd Bergmann <arnd@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@kernel.org>
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
Link: https://lore.kernel.org/r/20230522105049.1467313-7-schnelle@linux.ibm.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Niklas Schnelle and committed by
Greg Kroah-Hartman b5c75b68 1fbb0b20

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