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.

Merge tag 'char-misc-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc fix from Greg KH:
"Here is a single patch for 6.6-rc2 that reverts a 6.5 change for the
comedi subsystem that has ended up being incorrect and caused drivers
that were working for people to be unable to be able to be selected to
build at all.

To fix this, the Kconfig change needs to be reverted and a future set
of fixes for the ioport dependancies will show up in 6.7-rc1 (there's
no rush for them.)

This has been in linux-next with no reported issues"

* tag 'char-misc-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
Revert "comedi: add HAS_IOPORT dependencies"

Linus Torvalds fd455e77 c37f8efc

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