[02/21] linux: Disable the entire PCMCIA/CardBus subsystem

Message ID 22432036-54b3-39b5-4dd3-469a5dd58e58@ipfire.org
State Accepted
Commit 0548bad00a00e416c36fc181608fc7c3d9fb9131
Headers
Series linux: Update to 5.15.85 and backport many IPFire 3.x changes |

Commit Message

Peter Müller Dec. 26, 2022, 7:24 p.m. UTC
  Backported from IPFire 3.x as 3d9d44ddaec6b32eaa5c0fc6470ec61d23e61f92.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---
 config/kernel/kernel.config.x86_64-ipfire | 63 +----------------------
 1 file changed, 1 insertion(+), 62 deletions(-)
  

Comments

Michael Tremer Dec. 27, 2022, 10:39 a.m. UTC | #1
I agree with this change, since we do not have any hardware like this any more.

Acked-by: Michael Tremer <michael.tremer@ipfire.org>

> On 26 Dec 2022, at 20:24, Peter Müller <peter.mueller@ipfire.org> wrote:
> 
> Backported from IPFire 3.x as 3d9d44ddaec6b32eaa5c0fc6470ec61d23e61f92.
> 
> Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
> ---
> config/kernel/kernel.config.x86_64-ipfire | 63 +----------------------
> 1 file changed, 1 insertion(+), 62 deletions(-)
> 
> diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
> index b160322cf..420f8d98d 100644
> --- a/config/kernel/kernel.config.x86_64-ipfire
> +++ b/config/kernel/kernel.config.x86_64-ipfire
> @@ -1791,23 +1791,7 @@ CONFIG_PCI_HYPERV_INTERFACE=m
> # end of PCI switch controller drivers
> 
> # CONFIG_CXL_BUS is not set
> -CONFIG_PCCARD=m
> -CONFIG_PCMCIA=m
> -CONFIG_PCMCIA_LOAD_CIS=y
> -CONFIG_CARDBUS=y
> -
> -#
> -# PC-card bridges
> -#
> -CONFIG_YENTA=m
> -CONFIG_YENTA_O2=y
> -CONFIG_YENTA_RICOH=y
> -CONFIG_YENTA_TI=y
> -CONFIG_YENTA_ENE_TUNE=y
> -CONFIG_YENTA_TOSHIBA=y
> -CONFIG_PD6729=m
> -CONFIG_I82092=m
> -CONFIG_PCCARD_NONSTATIC=y
> +# CONFIG_PCCARD is not set
> # CONFIG_RAPIDIO is not set
> 
> #
> @@ -1923,7 +1907,6 @@ CONFIG_PARPORT_PC=m
> CONFIG_PARPORT_SERIAL=m
> CONFIG_PARPORT_PC_FIFO=y
> CONFIG_PARPORT_PC_SUPERIO=y
> -CONFIG_PARPORT_PC_PCMCIA=m
> CONFIG_PARPORT_AX88796=m
> CONFIG_PARPORT_1284=y
> CONFIG_PARPORT_NOT_PC=y
> @@ -2191,11 +2174,6 @@ CONFIG_SCSI_PM8001=m
> CONFIG_SCSI_BFA_FC=m
> CONFIG_SCSI_VIRTIO=m
> CONFIG_SCSI_CHELSIO_FCOE=m
> -CONFIG_SCSI_LOWLEVEL_PCMCIA=y
> -CONFIG_PCMCIA_AHA152X=m
> -CONFIG_PCMCIA_FDOMAIN=m
> -CONFIG_PCMCIA_QLOGIC=m
> -CONFIG_PCMCIA_SYM53C500=m
> CONFIG_SCSI_DH=y
> CONFIG_SCSI_DH_RDAC=m
> CONFIG_SCSI_DH_HP_SW=m
> @@ -2293,7 +2271,6 @@ CONFIG_PATA_CMD640_PCI=m
> CONFIG_PATA_MPIIX=m
> CONFIG_PATA_NS87410=m
> CONFIG_PATA_OPTI=m
> -CONFIG_PATA_PCMCIA=m
> CONFIG_PATA_PLATFORM=m
> CONFIG_PATA_RZ1000=m
> 
> @@ -2478,8 +2455,6 @@ CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM=m
> CONFIG_ETHERNET=y
> CONFIG_MDIO=m
> CONFIG_NET_VENDOR_3COM=y
> -CONFIG_PCMCIA_3C574=m
> -CONFIG_PCMCIA_3C589=m
> CONFIG_VORTEX=m
> CONFIG_TYPHOON=m
> CONFIG_NET_VENDOR_ADAPTEC=y
> @@ -2497,7 +2472,6 @@ CONFIG_ENA_ETHERNET=m
> CONFIG_NET_VENDOR_AMD=y
> CONFIG_AMD8111_ETH=m
> CONFIG_PCNET32=m
> -CONFIG_PCMCIA_NMCLAN=m
> CONFIG_AMD_XGBE=m
> CONFIG_AMD_XGBE_HAVE_ECC=y
> CONFIG_NET_VENDOR_AQUANTIA=y
> @@ -2565,7 +2539,6 @@ CONFIG_DE4X5=m
> CONFIG_WINBOND_840=m
> CONFIG_DM9102=m
> CONFIG_ULI526X=m
> -CONFIG_PCMCIA_XIRCOM=m
> CONFIG_NET_VENDOR_DLINK=y
> CONFIG_DL2K=m
> CONFIG_SUNDANCE=m
> @@ -2578,8 +2551,6 @@ CONFIG_BE2NET_BE3=y
> CONFIG_BE2NET_LANCER=y
> CONFIG_BE2NET_SKYHAWK=y
> CONFIG_NET_VENDOR_EZCHIP=y
> -CONFIG_NET_VENDOR_FUJITSU=y
> -CONFIG_PCMCIA_FMVJ18X=m
> CONFIG_NET_VENDOR_GOOGLE=y
> CONFIG_GVE=m
> CONFIG_NET_VENDOR_HUAWEI=y
> @@ -2676,9 +2647,7 @@ CONFIG_NFP_APP_FLOWER=y
> CONFIG_NFP_APP_ABM_NIC=y
> # CONFIG_NFP_DEBUG is not set
> CONFIG_NET_VENDOR_8390=y
> -CONFIG_PCMCIA_AXNET=m
> CONFIG_NE2K_PCI=m
> -CONFIG_PCMCIA_PCNET=m
> CONFIG_NET_VENDOR_NVIDIA=y
> CONFIG_FORCEDETH=m
> CONFIG_NET_VENDOR_OKI=y
> @@ -2735,7 +2704,6 @@ CONFIG_SFC_SRIOV=y
> CONFIG_SFC_MCDI_LOGGING=y
> CONFIG_SFC_FALCON=m
> CONFIG_NET_VENDOR_SMSC=y
> -CONFIG_PCMCIA_SMC91C92=m
> CONFIG_EPIC100=m
> CONFIG_SMSC911X=m
> CONFIG_SMSC9420=m
> @@ -2775,8 +2743,6 @@ CONFIG_NET_VENDOR_XILINX=y
> CONFIG_XILINX_EMACLITE=m
> CONFIG_XILINX_AXI_EMAC=m
> CONFIG_XILINX_LL_TEMAC=m
> -CONFIG_NET_VENDOR_XIRCOM=y
> -CONFIG_PCMCIA_XIRC2PS=m
> # CONFIG_FDDI is not set
> # CONFIG_HIPPI is not set
> CONFIG_NET_SB1000=m
> @@ -2974,7 +2940,6 @@ CONFIG_ATH11K_PCI=m
> CONFIG_WLAN_VENDOR_ATMEL=y
> CONFIG_ATMEL=m
> CONFIG_PCI_ATMEL=m
> -CONFIG_PCMCIA_ATMEL=m
> CONFIG_AT76C50X_USB=m
> CONFIG_WLAN_VENDOR_BROADCOM=y
> CONFIG_B43=m
> @@ -3018,7 +2983,6 @@ CONFIG_BRCMFMAC_PCIE=y
> # CONFIG_BRCMDBG is not set
> CONFIG_WLAN_VENDOR_CISCO=y
> CONFIG_AIRO=m
> -CONFIG_AIRO_CS=m
> CONFIG_WLAN_VENDOR_INTEL=y
> CONFIG_IPW2100=m
> CONFIG_IPW2100_MONITOR=y
> @@ -3061,15 +3025,12 @@ CONFIG_HOSTAP_FIRMWARE=y
> CONFIG_HOSTAP_FIRMWARE_NVRAM=y
> CONFIG_HOSTAP_PLX=m
> CONFIG_HOSTAP_PCI=m
> -CONFIG_HOSTAP_CS=m
> CONFIG_HERMES=m
> # CONFIG_HERMES_PRISM is not set
> CONFIG_HERMES_CACHE_FW_ON_INIT=y
> CONFIG_PLX_HERMES=m
> CONFIG_TMD_HERMES=m
> CONFIG_NORTEL_HERMES=m
> -CONFIG_PCMCIA_HERMES=m
> -CONFIG_PCMCIA_SPECTRUM=m
> CONFIG_ORINOCO_USB=m
> CONFIG_P54_COMMON=m
> CONFIG_P54_USB=m
> @@ -3078,7 +3039,6 @@ CONFIG_P54_LEDS=y
> CONFIG_WLAN_VENDOR_MARVELL=y
> CONFIG_LIBERTAS=m
> CONFIG_LIBERTAS_USB=m
> -CONFIG_LIBERTAS_CS=m
> CONFIG_LIBERTAS_SDIO=m
> # CONFIG_LIBERTAS_DEBUG is not set
> CONFIG_LIBERTAS_MESH=y
> @@ -3203,8 +3163,6 @@ CONFIG_ZD1211RW=m
> CONFIG_WLAN_VENDOR_QUANTENNA=y
> CONFIG_QTNFMAC=m
> CONFIG_QTNFMAC_PCIE=m
> -# CONFIG_PCMCIA_RAYCS is not set
> -CONFIG_PCMCIA_WL3501=m
> CONFIG_MAC80211_HWSIM=m
> CONFIG_USB_NET_RNDIS_WLAN=m
> # CONFIG_VIRT_WIFI is not set
> @@ -3388,7 +3346,6 @@ CONFIG_SERIAL_8250_CONSOLE=y
> CONFIG_SERIAL_8250_DMA=y
> CONFIG_SERIAL_8250_PCI=y
> CONFIG_SERIAL_8250_EXAR=m
> -# CONFIG_SERIAL_8250_CS is not set
> CONFIG_SERIAL_8250_NR_UARTS=4
> CONFIG_SERIAL_8250_RUNTIME_UARTS=4
> CONFIG_SERIAL_8250_EXTENDED=y
> @@ -3464,17 +3421,6 @@ CONFIG_HW_RANDOM_VIA=y
> CONFIG_HW_RANDOM_VIRTIO=y
> CONFIG_HW_RANDOM_XIPHERA=y
> # CONFIG_APPLICOM is not set
> -
> -#
> -# PCMCIA character devices
> -#
> -# CONFIG_SYNCLINK_CS is not set
> -# CONFIG_CARDMAN_4000 is not set
> -# CONFIG_CARDMAN_4040 is not set
> -# CONFIG_SCR24X is not set
> -# CONFIG_IPWIRELESS is not set
> -# end of PCMCIA character devices
> -
> CONFIG_MWAVE=m
> CONFIG_DEVMEM=y
> CONFIG_NVRAM=y
> @@ -4170,8 +4116,6 @@ CONFIG_SSB_BLOCKIO=y
> CONFIG_SSB_PCIHOST_POSSIBLE=y
> CONFIG_SSB_PCIHOST=y
> CONFIG_SSB_B43_PCI_BRIDGE=y
> -CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
> -CONFIG_SSB_PCMCIAHOST=y
> CONFIG_SSB_SDIOHOST_POSSIBLE=y
> CONFIG_SSB_SDIOHOST=y
> CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
> @@ -5504,9 +5448,6 @@ CONFIG_SND_USB_POD=m
> CONFIG_SND_USB_PODHD=m
> CONFIG_SND_USB_TONEPORT=m
> CONFIG_SND_USB_VARIAX=m
> -CONFIG_SND_PCMCIA=y
> -# CONFIG_SND_VXPOCKET is not set
> -# CONFIG_SND_PDAUDIOCF is not set
> # CONFIG_SND_SOC is not set
> CONFIG_SND_X86=y
> CONFIG_HDMI_LPE_AUDIO=m
> @@ -5714,7 +5655,6 @@ CONFIG_USB_UHCI_HCD=y
> # CONFIG_USB_U132_HCD is not set
> CONFIG_USB_SL811_HCD=m
> CONFIG_USB_SL811_HCD_ISO=y
> -# CONFIG_USB_SL811_CS is not set
> # CONFIG_USB_R8A66597_HCD is not set
> CONFIG_USB_HCD_BCMA=m
> CONFIG_USB_HCD_SSB=m
> @@ -5940,7 +5880,6 @@ CONFIG_MMC_SDHCI_PLTFM=m
> CONFIG_MMC_WBSD=m
> # CONFIG_MMC_ALCOR is not set
> CONFIG_MMC_TIFM_SD=m
> -# CONFIG_MMC_SDRICOH_CS is not set
> CONFIG_MMC_CB710=m
> CONFIG_MMC_VIA_SDMMC=m
> CONFIG_MMC_VUB300=m
> -- 
> 2.35.3
  

Patch

diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index b160322cf..420f8d98d 100644
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -1791,23 +1791,7 @@  CONFIG_PCI_HYPERV_INTERFACE=m
 # end of PCI switch controller drivers
 
 # CONFIG_CXL_BUS is not set
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=y
+# CONFIG_PCCARD is not set
 # CONFIG_RAPIDIO is not set
 
 #
@@ -1923,7 +1907,6 @@  CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
 CONFIG_PARPORT_PC_FIFO=y
 CONFIG_PARPORT_PC_SUPERIO=y
-CONFIG_PARPORT_PC_PCMCIA=m
 CONFIG_PARPORT_AX88796=m
 CONFIG_PARPORT_1284=y
 CONFIG_PARPORT_NOT_PC=y
@@ -2191,11 +2174,6 @@  CONFIG_SCSI_PM8001=m
 CONFIG_SCSI_BFA_FC=m
 CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_CHELSIO_FCOE=m
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
 CONFIG_SCSI_DH=y
 CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
@@ -2293,7 +2271,6 @@  CONFIG_PATA_CMD640_PCI=m
 CONFIG_PATA_MPIIX=m
 CONFIG_PATA_NS87410=m
 CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
 CONFIG_PATA_PLATFORM=m
 CONFIG_PATA_RZ1000=m
 
@@ -2478,8 +2455,6 @@  CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM=m
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
 CONFIG_VORTEX=m
 CONFIG_TYPHOON=m
 CONFIG_NET_VENDOR_ADAPTEC=y
@@ -2497,7 +2472,6 @@  CONFIG_ENA_ETHERNET=m
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_AMD8111_ETH=m
 CONFIG_PCNET32=m
-CONFIG_PCMCIA_NMCLAN=m
 CONFIG_AMD_XGBE=m
 CONFIG_AMD_XGBE_HAVE_ECC=y
 CONFIG_NET_VENDOR_AQUANTIA=y
@@ -2565,7 +2539,6 @@  CONFIG_DE4X5=m
 CONFIG_WINBOND_840=m
 CONFIG_DM9102=m
 CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_DL2K=m
 CONFIG_SUNDANCE=m
@@ -2578,8 +2551,6 @@  CONFIG_BE2NET_BE3=y
 CONFIG_BE2NET_LANCER=y
 CONFIG_BE2NET_SKYHAWK=y
 CONFIG_NET_VENDOR_EZCHIP=y
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_PCMCIA_FMVJ18X=m
 CONFIG_NET_VENDOR_GOOGLE=y
 CONFIG_GVE=m
 CONFIG_NET_VENDOR_HUAWEI=y
@@ -2676,9 +2647,7 @@  CONFIG_NFP_APP_FLOWER=y
 CONFIG_NFP_APP_ABM_NIC=y
 # CONFIG_NFP_DEBUG is not set
 CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
 CONFIG_NET_VENDOR_NVIDIA=y
 CONFIG_FORCEDETH=m
 CONFIG_NET_VENDOR_OKI=y
@@ -2735,7 +2704,6 @@  CONFIG_SFC_SRIOV=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_FALCON=m
 CONFIG_NET_VENDOR_SMSC=y
-CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
 CONFIG_SMSC911X=m
 CONFIG_SMSC9420=m
@@ -2775,8 +2743,6 @@  CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_EMACLITE=m
 CONFIG_XILINX_AXI_EMAC=m
 CONFIG_XILINX_LL_TEMAC=m
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 CONFIG_NET_SB1000=m
@@ -2974,7 +2940,6 @@  CONFIG_ATH11K_PCI=m
 CONFIG_WLAN_VENDOR_ATMEL=y
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
 CONFIG_AT76C50X_USB=m
 CONFIG_WLAN_VENDOR_BROADCOM=y
 CONFIG_B43=m
@@ -3018,7 +2983,6 @@  CONFIG_BRCMFMAC_PCIE=y
 # CONFIG_BRCMDBG is not set
 CONFIG_WLAN_VENDOR_CISCO=y
 CONFIG_AIRO=m
-CONFIG_AIRO_CS=m
 CONFIG_WLAN_VENDOR_INTEL=y
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
@@ -3061,15 +3025,12 @@  CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
 CONFIG_HERMES=m
 # CONFIG_HERMES_PRISM is not set
 CONFIG_HERMES_CACHE_FW_ON_INIT=y
 CONFIG_PLX_HERMES=m
 CONFIG_TMD_HERMES=m
 CONFIG_NORTEL_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_ORINOCO_USB=m
 CONFIG_P54_COMMON=m
 CONFIG_P54_USB=m
@@ -3078,7 +3039,6 @@  CONFIG_P54_LEDS=y
 CONFIG_WLAN_VENDOR_MARVELL=y
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
 CONFIG_LIBERTAS_SDIO=m
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS_MESH=y
@@ -3203,8 +3163,6 @@  CONFIG_ZD1211RW=m
 CONFIG_WLAN_VENDOR_QUANTENNA=y
 CONFIG_QTNFMAC=m
 CONFIG_QTNFMAC_PCIE=m
-# CONFIG_PCMCIA_RAYCS is not set
-CONFIG_PCMCIA_WL3501=m
 CONFIG_MAC80211_HWSIM=m
 CONFIG_USB_NET_RNDIS_WLAN=m
 # CONFIG_VIRT_WIFI is not set
@@ -3388,7 +3346,6 @@  CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_DMA=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_EXAR=m
-# CONFIG_SERIAL_8250_CS is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_8250_EXTENDED=y
@@ -3464,17 +3421,6 @@  CONFIG_HW_RANDOM_VIA=y
 CONFIG_HW_RANDOM_VIRTIO=y
 CONFIG_HW_RANDOM_XIPHERA=y
 # CONFIG_APPLICOM is not set
-
-#
-# PCMCIA character devices
-#
-# CONFIG_SYNCLINK_CS is not set
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
-# CONFIG_SCR24X is not set
-# CONFIG_IPWIRELESS is not set
-# end of PCMCIA character devices
-
 CONFIG_MWAVE=m
 CONFIG_DEVMEM=y
 CONFIG_NVRAM=y
@@ -4170,8 +4116,6 @@  CONFIG_SSB_BLOCKIO=y
 CONFIG_SSB_PCIHOST_POSSIBLE=y
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST_POSSIBLE=y
 CONFIG_SSB_SDIOHOST=y
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
@@ -5504,9 +5448,6 @@  CONFIG_SND_USB_POD=m
 CONFIG_SND_USB_PODHD=m
 CONFIG_SND_USB_TONEPORT=m
 CONFIG_SND_USB_VARIAX=m
-CONFIG_SND_PCMCIA=y
-# CONFIG_SND_VXPOCKET is not set
-# CONFIG_SND_PDAUDIOCF is not set
 # CONFIG_SND_SOC is not set
 CONFIG_SND_X86=y
 CONFIG_HDMI_LPE_AUDIO=m
@@ -5714,7 +5655,6 @@  CONFIG_USB_UHCI_HCD=y
 # CONFIG_USB_U132_HCD is not set
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_HCD_ISO=y
-# CONFIG_USB_SL811_CS is not set
 # CONFIG_USB_R8A66597_HCD is not set
 CONFIG_USB_HCD_BCMA=m
 CONFIG_USB_HCD_SSB=m
@@ -5940,7 +5880,6 @@  CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_WBSD=m
 # CONFIG_MMC_ALCOR is not set
 CONFIG_MMC_TIFM_SD=m
-# CONFIG_MMC_SDRICOH_CS is not set
 CONFIG_MMC_CB710=m
 CONFIG_MMC_VIA_SDMMC=m
 CONFIG_MMC_VUB300=m