History

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 committed 3 years ago

Commit fd455e72 parents c37f8ef 98a15811 file · +35 −68Browse files

Unified · Split

drivers/comedi/Kconfig+35−68
@@ -67,7 +67,6 @@ config COMEDI_TEST · 66 unmodified lines
6767
6868 config COMEDI_PARPORT
6969 tristate "Parallel port support"
70− depends on HAS_IOPORT
7170 help
7271 Enable support for the standard parallel port.
7372 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
8079 config COMEDI_SSV_DNP
8180 tristate "SSV Embedded Systems DIL/Net-PC support"
8281 depends on X86_32 || COMPILE_TEST
83− depends on HAS_IOPORT
8482 help
8583 Enable support for SSV Embedded Systems DIL/Net-PC
8684
@@ -91,7 +89,6 @@ endif # COMEDI_MISC_DRIVERS · 4 unmodified lines
9189
9290 menuconfig COMEDI_ISA_DRIVERS
9391 bool "Comedi ISA and PC/104 drivers"
94− depends on ISA
9592 help
9693 Enable comedi ISA and PC/104 drivers to be built
9794
@@ -103,8 +100,7 @@ if COMEDI_ISA_DRIVERS · 5 unmodified lines
103100
104101 config COMEDI_PCL711
105102 tristate "Advantech PCL-711/711b and ADlink ACL-8112 ISA card support"
106− depends on HAS_IOPORT
107− depends on COMEDI_8254
103+ select COMEDI_8254
108104 help
109105 Enable support for Advantech PCL-711 and 711b, ADlink ACL-8112
110106
@@ -165,9 +161,8 @@ config COMEDI_PCL730 · 54 unmodified lines
165161
166162 config COMEDI_PCL812
167163 tristate "Advantech PCL-812/813 and ADlink ACL-8112/8113/8113/8216"
168− depends on HAS_IOPORT
169164 select COMEDI_ISADMA if ISA_DMA_API
170− depends on COMEDI_8254
165+ select COMEDI_8254
171166 help
172167 Enable support for Advantech PCL-812/PG, PCL-813/B, ADLink
173168 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
178173
179174 config COMEDI_PCL816
180175 tristate "Advantech PCL-814 and PCL-816 ISA card support"
181− depends on HAS_IOPORT
182176 select COMEDI_ISADMA if ISA_DMA_API
183− depends on COMEDI_8254
177+ select COMEDI_8254
184178 help
185179 Enable support for Advantech PCL-814 and PCL-816 ISA cards
186180
@@ -189,9 +183,8 @@ config COMEDI_PCL816 · 2 unmodified lines
189183
190184 config COMEDI_PCL818
191185 tristate "Advantech PCL-718 and PCL-818 ISA card support"
192− depends on HAS_IOPORT
193186 select COMEDI_ISADMA if ISA_DMA_API
194− depends on COMEDI_8254
187+ select COMEDI_8254
195188 help
196189 Enable support for Advantech PCL-818 ISA cards
197190 PCL-818L, PCL-818H, PCL-818HD, PCL-818HG, PCL-818 and PCL-718
@@ -210,7 +203,7 @@ config COMEDI_PCM3724 · 12 unmodified lines
210203
211204 config COMEDI_AMPLC_DIO200_ISA
212205 tristate "Amplicon PC212E/PC214E/PC215E/PC218E/PC272E"
213− depends on COMEDI_AMPLC_DIO200
206+ select COMEDI_AMPLC_DIO200
214207 help
215208 Enable support for Amplicon PC212E, PC214E, PC215E, PC218E and
216209 PC272E ISA DIO boards
@@ -262,8 +255,7 @@ config COMEDI_DAC02 · 45 unmodified lines
262255
263256 config COMEDI_DAS16M1
264257 tristate "MeasurementComputing CIO-DAS16/M1DAS-16 ISA card support"
265− depends on HAS_IOPORT
266− depends on COMEDI_8254
258+ select COMEDI_8254
267259 select COMEDI_8255
268260 help
269261 Enable support for Measurement Computing CIO-DAS16/M1 ISA cards.
@@ -273,7 +265,7 @@ config COMEDI_DAS16M1 · 3 unmodified lines
273265
274266 config COMEDI_DAS08_ISA
275267 tristate "DAS-08 compatible ISA and PC/104 card support"
276− depends on COMEDI_DAS08
268+ select COMEDI_DAS08
277269 help
278270 Enable support for Keithley Metrabyte/ComputerBoards DAS08
279271 and compatible ISA and PC/104 cards:
@@ -286,9 +278,8 @@ config COMEDI_DAS08_ISA · 6 unmodified lines
286278
287279 config COMEDI_DAS16
288280 tristate "DAS-16 compatible ISA and PC/104 card support"
289− depends on HAS_IOPORT
290281 select COMEDI_ISADMA if ISA_DMA_API
291− depends on COMEDI_8254
282+ select COMEDI_8254
292283 select COMEDI_8255
293284 help
294285 Enable support for Keithley Metrabyte/ComputerBoards DAS16
@@ -305,8 +296,7 @@ config COMEDI_DAS16 · 10 unmodified lines
305296
306297 config COMEDI_DAS800
307298 tristate "DAS800 and compatible ISA card support"
308− depends on HAS_IOPORT
309− depends on COMEDI_8254
299+ select COMEDI_8254
310300 help
311301 Enable support for Keithley Metrabyte DAS800 and compatible ISA cards
312302 Keithley Metrabyte DAS-800, DAS-801, DAS-802
@@ -318,9 +308,8 @@ config COMEDI_DAS800 · 5 unmodified lines
318308
319309 config COMEDI_DAS1800
320310 tristate "DAS1800 and compatible ISA card support"
321− depends on HAS_IOPORT
322311 select COMEDI_ISADMA if ISA_DMA_API
323− depends on COMEDI_8254
312+ select COMEDI_8254
324313 help
325314 Enable support for DAS1800 and compatible ISA cards
326315 Keithley Metrabyte DAS-1701ST, DAS-1701ST-DA, DAS-1701/AO,
@@ -334,8 +323,7 @@ config COMEDI_DAS1800 · 7 unmodified lines
334323
335324 config COMEDI_DAS6402
336325 tristate "DAS6402 and compatible ISA card support"
337− depends on HAS_IOPORT
338− depends on COMEDI_8254
326+ select COMEDI_8254
339327 help
340328 Enable support for DAS6402 and compatible ISA cards
341329 Computerboards, Keithley Metrabyte DAS6402 and compatibles
@@ -414,8 +402,7 @@ config COMEDI_FL512 · 72 unmodified lines
414402
415403 config COMEDI_AIO_AIO12_8
416404 tristate "I/O Products PC/104 AIO12-8 Analog I/O Board support"
417− depends on HAS_IOPORT
418− depends on COMEDI_8254
405+ select COMEDI_8254
419406 select COMEDI_8255
420407 help
421408 Enable support for I/O Products PC/104 AIO12-8 Analog I/O Board
@@ -469,9 +456,8 @@ config COMEDI_ADQ12B · 47 unmodified lines
469456
470457 config COMEDI_NI_AT_A2150
471458 tristate "NI AT-A2150 ISA card support"
472− depends on HAS_IOPORT
473459 select COMEDI_ISADMA if ISA_DMA_API
474− depends on COMEDI_8254
460+ select COMEDI_8254
475461 help
476462 Enable support for National Instruments AT-A2150 cards
477463
@@ -480,8 +466,7 @@ config COMEDI_NI_AT_A2150 · 2 unmodified lines
480466
481467 config COMEDI_NI_AT_AO
482468 tristate "NI AT-AO-6/10 EISA card support"
483− depends on HAS_IOPORT
484− depends on COMEDI_8254
469+ select COMEDI_8254
485470 help
486471 Enable support for National Instruments AT-AO-6/10 cards
487472
@@ -512,7 +497,7 @@ config COMEDI_NI_ATMIO16D · 24 unmodified lines
512497
513498 config COMEDI_NI_LABPC_ISA
514499 tristate "NI Lab-PC and compatibles ISA support"
515− depends on COMEDI_NI_LABPC
500+ select COMEDI_NI_LABPC
516501 help
517502 Enable support for National Instruments Lab-PC and compatibles
518503 Lab-PC-1200, Lab-PC-1200AI, Lab-PC+.
@@ -576,7 +561,7 @@ endif # COMEDI_ISA_DRIVERS · 57 unmodified lines
576561
577562 menuconfig COMEDI_PCI_DRIVERS
578563 tristate "Comedi PCI drivers"
579− depends on PCI && HAS_IOPORT
564+ depends on PCI
580565 help
581566 Enable support for comedi PCI drivers.
582567
@@ -725,8 +710,7 @@ config COMEDI_ADL_PCI8164 · 142 unmodified lines
725710
726711 config COMEDI_ADL_PCI9111
727712 tristate "ADLink PCI-9111HR support"
728− depends on HAS_IOPORT
729− depends on COMEDI_8254
713+ select COMEDI_8254
730714 help
731715 Enable support for ADlink PCI9111 cards
732716
@@ -736,7 +720,7 @@ config COMEDI_ADL_PCI9111 · 3 unmodified lines
736720 config COMEDI_ADL_PCI9118
737721 tristate "ADLink PCI-9118DG, PCI-9118HG, PCI-9118HR support"
738722 depends on HAS_DMA
739− depends on COMEDI_8254
723+ select COMEDI_8254
740724 help
741725 Enable support for ADlink PCI-9118DG, PCI-9118HG, PCI-9118HR cards
742726
@@ -745,8 +729,7 @@ config COMEDI_ADL_PCI9118 · 2 unmodified lines
745729
746730 config COMEDI_ADV_PCI1710
747731 tristate "Advantech PCI-171x and PCI-1731 support"
748− depends on HAS_IOPORT
749− depends on COMEDI_8254
732+ select COMEDI_8254
750733 help
751734 Enable support for Advantech PCI-1710, PCI-1710HG, PCI-1711,
752735 PCI-1713 and PCI-1731
@@ -790,8 +773,7 @@ config COMEDI_ADV_PCI1760 · 37 unmodified lines
790773
791774 config COMEDI_ADV_PCI_DIO
792775 tristate "Advantech PCI DIO card support"
793− depends on HAS_IOPORT
794− depends on COMEDI_8254
776+ select COMEDI_8254
795777 select COMEDI_8255
796778 help
797779 Enable support for Advantech PCI DIO cards
@@ -804,7 +786,7 @@ config COMEDI_ADV_PCI_DIO · 6 unmodified lines
804786
805787 config COMEDI_AMPLC_DIO200_PCI
806788 tristate "Amplicon PCI215/PCI272/PCIe215/PCIe236/PCIe296 DIO support"
807− depends on COMEDI_AMPLC_DIO200
789+ select COMEDI_AMPLC_DIO200
808790 help
809791 Enable support for Amplicon PCI215, PCI272, PCIe215, PCIe236
810792 and PCIe296 DIO boards.
@@ -832,8 +814,7 @@ config COMEDI_AMPLC_PC263_PCI · 21 unmodified lines
832814
833815 config COMEDI_AMPLC_PCI224
834816 tristate "Amplicon PCI224 and PCI234 support"
835− depends on HAS_IOPORT
836− depends on COMEDI_8254
817+ select COMEDI_8254
837818 help
838819 Enable support for Amplicon PCI224 and PCI234 AO boards
839820
@@ -842,8 +823,7 @@ config COMEDI_AMPLC_PCI224 · 2 unmodified lines
842823
843824 config COMEDI_AMPLC_PCI230
844825 tristate "Amplicon PCI230 and PCI260 support"
845− depends on HAS_IOPORT
846− depends on COMEDI_8254
826+ select COMEDI_8254
847827 select COMEDI_8255
848828 help
849829 Enable support for Amplicon PCI230 and PCI260 Multifunction I/O
@@ -862,7 +842,7 @@ config COMEDI_CONTEC_PCI_DIO · 12 unmodified lines
862842
863843 config COMEDI_DAS08_PCI
864844 tristate "DAS-08 PCI support"
865− depends on COMEDI_DAS08
845+ select COMEDI_DAS08
866846 help
867847 Enable support for PCI DAS-08 cards.
868848
@@ -949,8 +929,7 @@ config COMEDI_CB_PCIDAS64 · 80 unmodified lines
949929
950930 config COMEDI_CB_PCIDAS
951931 tristate "MeasurementComputing PCI-DAS support"
952− depends on HAS_IOPORT
953− depends on COMEDI_8254
932+ select COMEDI_8254
954933 select COMEDI_8255
955934 help
956935 Enable support for ComputerBoards/MeasurementComputing PCI-DAS with
@@ -974,8 +953,7 @@ config COMEDI_CB_PCIDDA · 17 unmodified lines
974953
975954 config COMEDI_CB_PCIMDAS
976955 tristate "MeasurementComputing PCIM-DAS1602/16, PCIe-DAS1602/16 support"
977− depends on HAS_IOPORT
978− depends on COMEDI_8254
956+ select COMEDI_8254
979957 select COMEDI_8255
980958 help
981959 Enable support for ComputerBoards/MeasurementComputing PCI Migration
@@ -995,8 +973,7 @@ config COMEDI_CB_PCIMDDA · 13 unmodified lines
995973
996974 config COMEDI_ME4000
997975 tristate "Meilhaus ME-4000 support"
998− depends on HAS_IOPORT
999− depends on COMEDI_8254
976+ select COMEDI_8254
1000977 help
1001978 Enable support for Meilhaus PCI data acquisition cards
1002979 ME-4650, ME-4670i, ME-4680, ME-4680i and ME-4680is
@@ -1054,7 +1031,7 @@ config COMEDI_NI_670X · 51 unmodified lines
10541031
10551032 config COMEDI_NI_LABPC_PCI
10561033 tristate "NI Lab-PC PCI-1200 support"
1057− depends on COMEDI_NI_LABPC
1034+ select COMEDI_NI_LABPC
10581035 help
10591036 Enable support for National Instruments Lab-PC PCI-1200.
10601037
@@ -1076,7 +1053,6 @@ config COMEDI_NI_PCIDIO · 15 unmodified lines
10761053 config COMEDI_NI_PCIMIO
10771054 tristate "NI PCI-MIO-E series and M series support"
10781055 depends on HAS_DMA
1079− depends on HAS_IOPORT
10801056 select COMEDI_NI_TIOCMD
10811057 select COMEDI_8255
10821058 help
@@ -1098,8 +1074,7 @@ config COMEDI_NI_PCIMIO · 15 unmodified lines
10981074
10991075 config COMEDI_RTD520
11001076 tristate "Real Time Devices PCI4520/DM7520 support"
1101− depends on HAS_IOPORT
1102− depends on COMEDI_8254
1077+ select COMEDI_8254
11031078 help
11041079 Enable support for Real Time Devices PCI4520/DM7520
11051080
@@ -1139,8 +1114,7 @@ if COMEDI_PCMCIA_DRIVERS · 33 unmodified lines
11391114
11401115 config COMEDI_CB_DAS16_CS
11411116 tristate "CB DAS16 series PCMCIA support"
1142− depends on HAS_IOPORT
1143− depends on COMEDI_8254
1117+ select COMEDI_8254
11441118 help
11451119 Enable support for the ComputerBoards/MeasurementComputing PCMCIA
11461120 cards DAS16/16, PCM-DAS16D/12 and PCM-DAS16s/16
@@ -1150,7 +1124,7 @@ config COMEDI_CB_DAS16_CS · 3 unmodified lines
11501124
11511125 config COMEDI_DAS08_CS
11521126 tristate "CB DAS08 PCMCIA support"
1153− depends on COMEDI_DAS08
1127+ select COMEDI_DAS08
11541128 help
11551129 Enable support for the ComputerBoards/MeasurementComputing DAS-08
11561130 PCMCIA card
@@ -1160,7 +1134,6 @@ config COMEDI_DAS08_CS · 3 unmodified lines
11601134
11611135 config COMEDI_NI_DAQ_700_CS
11621136 tristate "NI DAQCard-700 PCMCIA support"
1163− depends on HAS_IOPORT
11641137 help
11651138 Enable support for the National Instruments PCMCIA DAQCard-700 DIO
11661139
@@ -1169,7 +1142,6 @@ config COMEDI_NI_DAQ_700_CS · 2 unmodified lines
11691142
11701143 config COMEDI_NI_DAQ_DIO24_CS
11711144 tristate "NI DAQ-Card DIO-24 PCMCIA support"
1172− depends on HAS_IOPORT
11731145 select COMEDI_8255
11741146 help
11751147 Enable support for the National Instruments PCMCIA DAQ-Card DIO-24
@@ -1179,7 +1151,7 @@ config COMEDI_NI_DAQ_DIO24_CS · 3 unmodified lines
11791151
11801152 config COMEDI_NI_LABPC_CS
11811153 tristate "NI DAQCard-1200 PCMCIA support"
1182− depends on COMEDI_NI_LABPC
1154+ select COMEDI_NI_LABPC
11831155 help
11841156 Enable support for the National Instruments PCMCIA DAQCard-1200
11851157
@@ -1188,7 +1160,6 @@ config COMEDI_NI_LABPC_CS · 2 unmodified lines
11881160
11891161 config COMEDI_NI_MIO_CS
11901162 tristate "NI DAQCard E series PCMCIA support"
1191− depends on HAS_IOPORT
11921163 select COMEDI_NI_TIO
11931164 select COMEDI_8255
11941165 help
@@ -1201,7 +1172,6 @@ config COMEDI_NI_MIO_CS · 6 unmodified lines
12011172
12021173 config COMEDI_QUATECH_DAQP_CS
12031174 tristate "Quatech DAQP PCMCIA data capture card support"
1204− depends on HAS_IOPORT
12051175 help
12061176 Enable support for the Quatech DAQP PCMCIA data capture cards
12071177 DAQP-208 and DAQP-308
@@ -1278,14 +1248,12 @@ endif # COMEDI_USB_DRIVERS · 70 unmodified lines
12781248
12791249 config COMEDI_8254
12801250 tristate
1281− depends on HAS_IOPORT
12821251
12831252 config COMEDI_8255
12841253 tristate
12851254
12861255 config COMEDI_8255_SA
12871256 tristate "Standalone 8255 support"
1288− depends on HAS_IOPORT
12891257 select COMEDI_8255
12901258 help
12911259 Enable support for 8255 digital I/O as a standalone driver.
@@ -1317,7 +1285,7 @@ config COMEDI_KCOMEDILIB · 25 unmodified lines
13171285 called kcomedilib.
13181286
13191287 config COMEDI_AMPLC_DIO200
1320− depends on COMEDI_8254
1288+ select COMEDI_8254
13211289 tristate
13221290
13231291 config COMEDI_AMPLC_PC236
@@ -1326,7 +1294,7 @@ config COMEDI_AMPLC_PC236 · 2 unmodified lines
13261294
13271295 config COMEDI_DAS08
13281296 tristate
1329− depends on COMEDI_8254
1297+ select COMEDI_8254
13301298 select COMEDI_8255
13311299
13321300 config COMEDI_ISADMA
@@ -1334,8 +1302,7 @@ config COMEDI_ISADMA · 1 unmodified line
13341302
13351303 config COMEDI_NI_LABPC
13361304 tristate
1337− depends on HAS_IOPORT
1338− depends on COMEDI_8254
1305+ select COMEDI_8254
13391306 select COMEDI_8255
13401307
13411308 config COMEDI_NI_LABPC_ISADMA