Commit fd455e77 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents c37f8efc 98a15816

drivers/comedi/Kconfig

+35 −68
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ config COMEDI_TEST 


config COMEDI_PARPORT

	tristate "Parallel port support"

	depends on HAS_IOPORT

	help

	  Enable support for the standard parallel port.

	  A cheap and easy way to get a few more digital I/O lines. Steal
@@ -80,7 +79,6 @@ config COMEDI_PARPORT 
config COMEDI_SSV_DNP

	tristate "SSV Embedded Systems DIL/Net-PC support"

	depends on X86_32 || COMPILE_TEST

	depends on HAS_IOPORT

	help

	  Enable support for SSV Embedded Systems DIL/Net-PC
@@ -91,7 +89,6 @@ endif # COMEDI_MISC_DRIVERS 


menuconfig COMEDI_ISA_DRIVERS

	bool "Comedi ISA and PC/104 drivers"

	depends on ISA

	help

	  Enable comedi ISA and PC/104 drivers to be built
@@ -103,8 +100,7 @@ if COMEDI_ISA_DRIVERS 


config COMEDI_PCL711

	tristate "Advantech PCL-711/711b and ADlink ACL-8112 ISA card support"

	depends on HAS_IOPORT

	depends on COMEDI_8254

	select COMEDI_8254

	help

	  Enable support for Advantech PCL-711 and 711b, ADlink ACL-8112
@@ -165,9 +161,8 @@ config COMEDI_PCL730 


config COMEDI_PCL812

	tristate "Advantech PCL-812/813 and ADlink ACL-8112/8113/8113/8216"

	depends on HAS_IOPORT

	select COMEDI_ISADMA if ISA_DMA_API

	depends on COMEDI_8254

	select COMEDI_8254

	help

	  Enable support for Advantech PCL-812/PG, PCL-813/B, ADLink

	  ACL-8112DG/HG/PG, ACL-8113, ACL-8216, ICP DAS A-821PGH/PGL/PGL-NDA,
@@ -178,9 +173,8 @@ config COMEDI_PCL812 


config COMEDI_PCL816

	tristate "Advantech PCL-814 and PCL-816 ISA card support"

	depends on HAS_IOPORT

	select COMEDI_ISADMA if ISA_DMA_API

	depends on COMEDI_8254

	select COMEDI_8254

	help

	  Enable support for Advantech PCL-814 and PCL-816 ISA cards
@@ -189,9 +183,8 @@ config COMEDI_PCL816 


config COMEDI_PCL818

	tristate "Advantech PCL-718 and PCL-818 ISA card support"

	depends on HAS_IOPORT

	select COMEDI_ISADMA if ISA_DMA_API

	depends on COMEDI_8254

	select COMEDI_8254

	help

	  Enable support for Advantech PCL-818 ISA cards

	  PCL-818L, PCL-818H, PCL-818HD, PCL-818HG, PCL-818 and PCL-718
@@ -210,7 +203,7 @@ config COMEDI_PCM3724 


config COMEDI_AMPLC_DIO200_ISA

	tristate "Amplicon PC212E/PC214E/PC215E/PC218E/PC272E"

	depends on COMEDI_AMPLC_DIO200

	select COMEDI_AMPLC_DIO200

	help

	  Enable support for Amplicon PC212E, PC214E, PC215E, PC218E and

	  PC272E ISA DIO boards
@@ -262,8 +255,7 @@ config COMEDI_DAC02 


config COMEDI_DAS16M1

	tristate "MeasurementComputing CIO-DAS16/M1DAS-16 ISA card support"

	depends on HAS_IOPORT

	depends on COMEDI_8254

	select COMEDI_8254

	select COMEDI_8255

	help

	  Enable support for Measurement Computing CIO-DAS16/M1 ISA cards.
@@ -273,7 +265,7 @@ config COMEDI_DAS16M1 


config COMEDI_DAS08_ISA

	tristate "DAS-08 compatible ISA and PC/104 card support"

	depends on COMEDI_DAS08

	select COMEDI_DAS08

	help

	  Enable support for Keithley Metrabyte/ComputerBoards DAS08

	  and compatible ISA and PC/104 cards:
@@ -286,9 +278,8 @@ config COMEDI_DAS08_ISA 


config COMEDI_DAS16

	tristate "DAS-16 compatible ISA and PC/104 card support"

	depends on HAS_IOPORT

	select COMEDI_ISADMA if ISA_DMA_API

	depends on COMEDI_8254

	select COMEDI_8254

	select COMEDI_8255

	help

	  Enable support for Keithley Metrabyte/ComputerBoards DAS16
@@ -305,8 +296,7 @@ config COMEDI_DAS16 


config COMEDI_DAS800

	tristate "DAS800 and compatible ISA card support"

	depends on HAS_IOPORT

	depends on COMEDI_8254

	select COMEDI_8254

	help

	  Enable support for Keithley Metrabyte DAS800 and compatible ISA cards

	  Keithley Metrabyte DAS-800, DAS-801, DAS-802
@@ -318,9 +308,8 @@ config COMEDI_DAS800 


config COMEDI_DAS1800

	tristate "DAS1800 and compatible ISA card support"

	depends on HAS_IOPORT

	select COMEDI_ISADMA if ISA_DMA_API

	depends on COMEDI_8254

	select COMEDI_8254

	help

	  Enable support for DAS1800 and compatible ISA cards

	  Keithley Metrabyte DAS-1701ST, DAS-1701ST-DA, DAS-1701/AO,
@@ -334,8 +323,7 @@ config COMEDI_DAS1800 


config COMEDI_DAS6402

	tristate "DAS6402 and compatible ISA card support"

	depends on HAS_IOPORT

	depends on COMEDI_8254

	select COMEDI_8254

	help

	  Enable support for DAS6402 and compatible ISA cards

	  Computerboards, Keithley Metrabyte DAS6402 and compatibles
@@ -414,8 +402,7 @@ config COMEDI_FL512 


config COMEDI_AIO_AIO12_8

	tristate "I/O Products PC/104 AIO12-8 Analog I/O Board support"

	depends on HAS_IOPORT

	depends on COMEDI_8254

	select COMEDI_8254

	select COMEDI_8255

	help

	  Enable support for I/O Products PC/104 AIO12-8 Analog I/O Board
@@ -469,9 +456,8 @@ config COMEDI_ADQ12B 


config COMEDI_NI_AT_A2150

	tristate "NI AT-A2150 ISA card support"

	depends on HAS_IOPORT

	select COMEDI_ISADMA if ISA_DMA_API

	depends on COMEDI_8254

	select COMEDI_8254

	help

	  Enable support for National Instruments AT-A2150 cards
@@ -480,8 +466,7 @@ config COMEDI_NI_AT_A2150 


config COMEDI_NI_AT_AO

	tristate "NI AT-AO-6/10 EISA card support"

	depends on HAS_IOPORT

	depends on COMEDI_8254

	select COMEDI_8254

	help

	  Enable support for National Instruments AT-AO-6/10 cards
@@ -512,7 +497,7 @@ config COMEDI_NI_ATMIO16D 


config COMEDI_NI_LABPC_ISA

	tristate "NI Lab-PC and compatibles ISA support"

	depends on COMEDI_NI_LABPC

	select COMEDI_NI_LABPC

	help

	  Enable support for National Instruments Lab-PC and compatibles

	  Lab-PC-1200, Lab-PC-1200AI, Lab-PC+.
@@ -576,7 +561,7 @@ endif # COMEDI_ISA_DRIVERS 


menuconfig COMEDI_PCI_DRIVERS

	tristate "Comedi PCI drivers"

	depends on PCI && HAS_IOPORT

	depends on PCI

	help

	  Enable support for comedi PCI drivers.
@@ -725,8 +710,7 @@ config COMEDI_ADL_PCI8164 


config COMEDI_ADL_PCI9111

	tristate "ADLink PCI-9111HR support"

	depends on HAS_IOPORT

	depends on COMEDI_8254

	select COMEDI_8254

	help

	  Enable support for ADlink PCI9111 cards
@@ -736,7 +720,7 @@ config COMEDI_ADL_PCI9111 
config COMEDI_ADL_PCI9118

	tristate "ADLink PCI-9118DG, PCI-9118HG, PCI-9118HR support"

	depends on HAS_DMA

	depends on COMEDI_8254

	select COMEDI_8254

	help

	  Enable support for ADlink PCI-9118DG, PCI-9118HG, PCI-9118HR cards
@@ -745,8 +729,7 @@ config COMEDI_ADL_PCI9118 


config COMEDI_ADV_PCI1710

	tristate "Advantech PCI-171x and PCI-1731 support"

	depends on HAS_IOPORT

	depends on COMEDI_8254

	select COMEDI_8254

	help

	  Enable support for Advantech PCI-1710, PCI-1710HG, PCI-1711,

	  PCI-1713 and PCI-1731
@@ -790,8 +773,7 @@ config COMEDI_ADV_PCI1760 


config COMEDI_ADV_PCI_DIO

	tristate "Advantech PCI DIO card support"

	depends on HAS_IOPORT

	depends on COMEDI_8254

	select COMEDI_8254

	select COMEDI_8255

	help

	  Enable support for Advantech PCI DIO cards
@@ -804,7 +786,7 @@ config COMEDI_ADV_PCI_DIO 


config COMEDI_AMPLC_DIO200_PCI

	tristate "Amplicon PCI215/PCI272/PCIe215/PCIe236/PCIe296 DIO support"

	depends on COMEDI_AMPLC_DIO200

	select COMEDI_AMPLC_DIO200

	help

	  Enable support for Amplicon PCI215, PCI272, PCIe215, PCIe236

	  and PCIe296 DIO boards.
@@ -832,8 +814,7 @@ config COMEDI_AMPLC_PC263_PCI 


config COMEDI_AMPLC_PCI224

	tristate "Amplicon PCI224 and PCI234 support"

	depends on HAS_IOPORT

	depends on COMEDI_8254

	select COMEDI_8254

	help

	  Enable support for Amplicon PCI224 and PCI234 AO boards
@@ -842,8 +823,7 @@ config COMEDI_AMPLC_PCI224 


config COMEDI_AMPLC_PCI230

	tristate "Amplicon PCI230 and PCI260 support"

	depends on HAS_IOPORT

	depends on COMEDI_8254

	select COMEDI_8254

	select COMEDI_8255

	help

	  Enable support for Amplicon PCI230 and PCI260 Multifunction I/O
@@ -862,7 +842,7 @@ config COMEDI_CONTEC_PCI_DIO 


config COMEDI_DAS08_PCI

	tristate "DAS-08 PCI support"

	depends on COMEDI_DAS08

	select COMEDI_DAS08

	help

	  Enable support for PCI DAS-08 cards.
@@ -949,8 +929,7 @@ config COMEDI_CB_PCIDAS64 


config COMEDI_CB_PCIDAS

	tristate "MeasurementComputing PCI-DAS support"

	depends on HAS_IOPORT

	depends on COMEDI_8254

	select COMEDI_8254

	select COMEDI_8255

	help

	  Enable support for ComputerBoards/MeasurementComputing PCI-DAS with
@@ -974,8 +953,7 @@ config COMEDI_CB_PCIDDA 


config COMEDI_CB_PCIMDAS

	tristate "MeasurementComputing PCIM-DAS1602/16, PCIe-DAS1602/16 support"

	depends on HAS_IOPORT

	depends on COMEDI_8254

	select COMEDI_8254

	select COMEDI_8255

	help

	  Enable support for ComputerBoards/MeasurementComputing PCI Migration
@@ -995,8 +973,7 @@ config COMEDI_CB_PCIMDDA 


config COMEDI_ME4000

	tristate "Meilhaus ME-4000 support"

	depends on HAS_IOPORT

	depends on COMEDI_8254

	select COMEDI_8254

	help

	  Enable support for Meilhaus PCI data acquisition cards

	  ME-4650, ME-4670i, ME-4680, ME-4680i and ME-4680is
@@ -1054,7 +1031,7 @@ config COMEDI_NI_670X 


config COMEDI_NI_LABPC_PCI

	tristate "NI Lab-PC PCI-1200 support"

	depends on COMEDI_NI_LABPC

	select COMEDI_NI_LABPC

	help

	  Enable support for National Instruments Lab-PC PCI-1200.
@@ -1076,7 +1053,6 @@ config COMEDI_NI_PCIDIO 
config COMEDI_NI_PCIMIO

	tristate "NI PCI-MIO-E series and M series support"

	depends on HAS_DMA

	depends on HAS_IOPORT

	select COMEDI_NI_TIOCMD

	select COMEDI_8255

	help
@@ -1098,8 +1074,7 @@ config COMEDI_NI_PCIMIO 


config COMEDI_RTD520

	tristate "Real Time Devices PCI4520/DM7520 support"

	depends on HAS_IOPORT

	depends on COMEDI_8254

	select COMEDI_8254

	help

	  Enable support for Real Time Devices PCI4520/DM7520
@@ -1139,8 +1114,7 @@ if COMEDI_PCMCIA_DRIVERS 


config COMEDI_CB_DAS16_CS

	tristate "CB DAS16 series PCMCIA support"

	depends on HAS_IOPORT

	depends on COMEDI_8254

	select COMEDI_8254

	help

	  Enable support for the ComputerBoards/MeasurementComputing PCMCIA

	  cards DAS16/16, PCM-DAS16D/12 and PCM-DAS16s/16
@@ -1150,7 +1124,7 @@ config COMEDI_CB_DAS16_CS 


config COMEDI_DAS08_CS

	tristate "CB DAS08 PCMCIA support"

	depends on COMEDI_DAS08

	select COMEDI_DAS08

	help

	  Enable support for the ComputerBoards/MeasurementComputing DAS-08

	  PCMCIA card
@@ -1160,7 +1134,6 @@ config COMEDI_DAS08_CS 


config COMEDI_NI_DAQ_700_CS

	tristate "NI DAQCard-700 PCMCIA support"

	depends on HAS_IOPORT

	help

	  Enable support for the National Instruments PCMCIA DAQCard-700 DIO
@@ -1169,7 +1142,6 @@ config COMEDI_NI_DAQ_700_CS 


config COMEDI_NI_DAQ_DIO24_CS

	tristate "NI DAQ-Card DIO-24 PCMCIA support"

	depends on HAS_IOPORT

	select COMEDI_8255

	help

	  Enable support for the National Instruments PCMCIA DAQ-Card DIO-24
@@ -1179,7 +1151,7 @@ config COMEDI_NI_DAQ_DIO24_CS 


config COMEDI_NI_LABPC_CS

	tristate "NI DAQCard-1200 PCMCIA support"

	depends on COMEDI_NI_LABPC

	select COMEDI_NI_LABPC

	help

	  Enable support for the National Instruments PCMCIA DAQCard-1200
@@ -1188,7 +1160,6 @@ config COMEDI_NI_LABPC_CS 


config COMEDI_NI_MIO_CS

	tristate "NI DAQCard E series PCMCIA support"

	depends on HAS_IOPORT

	select COMEDI_NI_TIO

	select COMEDI_8255

	help
@@ -1201,7 +1172,6 @@ config COMEDI_NI_MIO_CS 


config COMEDI_QUATECH_DAQP_CS

	tristate "Quatech DAQP PCMCIA data capture card support"

	depends on HAS_IOPORT

	help

	  Enable support for the Quatech DAQP PCMCIA data capture cards

	  DAQP-208 and DAQP-308
@@ -1278,14 +1248,12 @@ endif # COMEDI_USB_DRIVERS 


config COMEDI_8254

	tristate

	depends on HAS_IOPORT



config COMEDI_8255

	tristate



config COMEDI_8255_SA

	tristate "Standalone 8255 support"

	depends on HAS_IOPORT

	select COMEDI_8255

	help

	  Enable support for 8255 digital I/O as a standalone driver.
@@ -1317,7 +1285,7 @@ config COMEDI_KCOMEDILIB 
	  called kcomedilib.



config COMEDI_AMPLC_DIO200

	depends on COMEDI_8254

	select COMEDI_8254

	tristate



config COMEDI_AMPLC_PC236
@@ -1326,7 +1294,7 @@ config COMEDI_AMPLC_PC236 


config COMEDI_DAS08

	tristate

	depends on COMEDI_8254

	select COMEDI_8254

	select COMEDI_8255



config COMEDI_ISADMA
@@ -1334,8 +1302,7 @@ config COMEDI_ISADMA 


config COMEDI_NI_LABPC

	tristate

	depends on HAS_IOPORT

	depends on COMEDI_8254

	select COMEDI_8254

	select COMEDI_8255



config COMEDI_NI_LABPC_ISADMA