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

staging: gpib: fix pcmcia dependencies

With CONFIG_PCMCIA=m, the gpib drivers that optionally support PCMCIA
cannot be built-in.

Add a Kconfig dependency to force these to be loadable modules as
well, and change the GPIB_PCMCIA symbol to have the correct state
for that.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20241213064959.1045243-1-arnd@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by Arnd Bergmann and committed by Greg Kroah-Hartman edbb7200 003d2abd

+5 -2
unified split
+5 -2
drivers/staging/gpib/Kconfig
··· 65 depends on ISA_BUS || PCI || PCMCIA 66 depends on HAS_IOPORT 67 depends on !X86_PAE 68 select GPIB_COMMON 69 select GPIB_NEC7210 70 help ··· 90 depends on HAS_IOPORT 91 depends on ISA_BUS || PCI || PCMCIA 92 depends on !X86_PAE 93 select GPIB_COMMON 94 select GPIB_NEC7210 95 help ··· 179 config GPIB_INES 180 tristate "INES" 181 depends on PCI || ISA_BUS || PCMCIA 182 depends on HAS_IOPORT 183 depends on !X86_PAE 184 select GPIB_COMMON ··· 202 called cb7210. 203 204 config GPIB_PCMCIA 205 - bool "PCMCIA/Cardbus support for NI MC and Ines boards" 206 - depends on PCCARD && (GPIB_NI_PCI_ISA || GPIB_CB7210 || GPIB_INES) 207 help 208 Enable PCMCIA/CArdbus support for National Instruments, 209 measurement computing boards and Ines boards.
··· 65 depends on ISA_BUS || PCI || PCMCIA 66 depends on HAS_IOPORT 67 depends on !X86_PAE 68 + depends on PCMCIA || !PCMCIA 69 select GPIB_COMMON 70 select GPIB_NEC7210 71 help ··· 89 depends on HAS_IOPORT 90 depends on ISA_BUS || PCI || PCMCIA 91 depends on !X86_PAE 92 + depends on PCMCIA || !PCMCIA 93 select GPIB_COMMON 94 select GPIB_NEC7210 95 help ··· 177 config GPIB_INES 178 tristate "INES" 179 depends on PCI || ISA_BUS || PCMCIA 180 + depends on PCMCIA || !PCMCIA 181 depends on HAS_IOPORT 182 depends on !X86_PAE 183 select GPIB_COMMON ··· 199 called cb7210. 200 201 config GPIB_PCMCIA 202 + def_bool y 203 + depends on PCMCIA && (GPIB_NI_PCI_ISA || GPIB_CB7210 || GPIB_INES) 204 help 205 Enable PCMCIA/CArdbus support for National Instruments, 206 measurement computing boards and Ines boards.