diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-19 23:50:10 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-19 23:50:10 +0300 |
| commit | 651283d57eb4107f4a81af282064e597e2f9b181 (patch) | |
| tree | 75926e598de1b099e32021d1c4d8753df9df86d9 /drivers/pcmcia/Kconfig | |
| parent | 190daf19206783bb16655db14e604a0d724c4bbf (diff) | |
| parent | 70d3a462fc244b0580268cc8e6c47ae4463db68a (diff) | |
| download | linux-651283d57eb4107f4a81af282064e597e2f9b181.tar.xz | |
Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux
Pull pcmcia updates from Dominik Brodowski:
"Besides a few PCMCIA odd fixes, the NEC VRC4173 CARDU driver is
removed, as it has not compiled in ages"
* 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
pcmcia: omap: Fix error return code in omap_cf_probe()
pcmcia: Remove NEC VRC4173 CARDU
pcmcia: db1xxx_ss: remove unneeded semicolon
pcmcia/electra_cf: Fix some return values in 'electra_cf_probe()' in case of error
Diffstat (limited to 'drivers/pcmcia/Kconfig')
| -rw-r--r-- | drivers/pcmcia/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index 884023e88345..d13b8d1a780a 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig @@ -244,10 +244,6 @@ config PCMCIA_VRC4171 tristate "NEC VRC4171 Card Controllers support" depends on CPU_VR41XX && ISA && PCMCIA -config PCMCIA_VRC4173 - tristate "NEC VRC4173 CARDU support" - depends on CPU_VR41XX && PCI && PCMCIA - config OMAP_CF tristate "OMAP CompactFlash Controller" depends on PCMCIA && ARCH_OMAP16XX |