Skip to content

Commit edbb720

Browse files
arndbgregkh
authored andcommitted
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>
1 parent 003d2ab commit edbb720

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

drivers/staging/gpib/Kconfig

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ config GPIB_NI_PCI_ISA
6565
depends on ISA_BUS || PCI || PCMCIA
6666
depends on HAS_IOPORT
6767
depends on !X86_PAE
68+
depends on PCMCIA || !PCMCIA
6869
select GPIB_COMMON
6970
select GPIB_NEC7210
7071
help
@@ -89,6 +90,7 @@ config GPIB_CB7210
8990
depends on HAS_IOPORT
9091
depends on ISA_BUS || PCI || PCMCIA
9192
depends on !X86_PAE
93+
depends on PCMCIA || !PCMCIA
9294
select GPIB_COMMON
9395
select GPIB_NEC7210
9496
help
@@ -177,6 +179,7 @@ config GPIB_HP82341
177179
config GPIB_INES
178180
tristate "INES"
179181
depends on PCI || ISA_BUS || PCMCIA
182+
depends on PCMCIA || !PCMCIA
180183
depends on HAS_IOPORT
181184
depends on !X86_PAE
182185
select GPIB_COMMON
@@ -199,8 +202,8 @@ config GPIB_INES
199202
called cb7210.
200203

201204
config GPIB_PCMCIA
202-
bool "PCMCIA/Cardbus support for NI MC and Ines boards"
203-
depends on PCCARD && (GPIB_NI_PCI_ISA || GPIB_CB7210 || GPIB_INES)
205+
def_bool y
206+
depends on PCMCIA && (GPIB_NI_PCI_ISA || GPIB_CB7210 || GPIB_INES)
204207
help
205208
Enable PCMCIA/CArdbus support for National Instruments,
206209
measurement computing boards and Ines boards.

0 commit comments

Comments
 (0)