diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-04 22:03:00 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-04 22:03:00 +0100 |
| commit | 87da4064701f9ed70e8c25b5ee9165450b1d0c40 (patch) | |
| tree | 45a6d6bd73ec6910d0d784091e471915beed0723 /kernel-ppc64le-debug-fedora.config | |
| parent | d656fcc48d8b13a41be16c7ec477c1f9a0c0d806 (diff) | |
| parent | 51aa5c5b1d358b0ca3334ad97ab57570830d324c (diff) | |
| download | kernel-87da4064701f9ed70e8c25b5ee9165450b1d0c40.tar.gz kernel-87da4064701f9ed70e8c25b5ee9165450b1d0c40.tar.xz kernel-87da4064701f9ed70e8c25b5ee9165450b1d0c40.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc2.114.vanilla.1.fc33kernel-5.11.0-0.rc2.114.vanilla.1.fc32
Diffstat (limited to 'kernel-ppc64le-debug-fedora.config')
| -rw-r--r-- | kernel-ppc64le-debug-fedora.config | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index bcbe6b2be..28c927f44 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -646,7 +646,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m CONFIG_CAN_DEBUG_DEVICES=y CONFIG_CAN_DEV=m CONFIG_CAN_EMS_PCI=m -# CONFIG_CAN_EMS_PCMCIA is not set CONFIG_CAN_EMS_USB=m CONFIG_CAN_ESD_USB2=m # CONFIG_CAN_F81601 is not set @@ -673,7 +672,6 @@ CONFIG_CAN_MCBA_USB=m CONFIG_CAN_PEAK_PCIEC=y CONFIG_CAN_PEAK_PCIEFD=m CONFIG_CAN_PEAK_PCI=m -# CONFIG_CAN_PEAK_PCMCIA is not set CONFIG_CAN_PEAK_USB=m CONFIG_CAN_PLX_PCI=m CONFIG_CAN_RAW=m @@ -4151,7 +4149,6 @@ CONFIG_PATA_NS87415=m # CONFIG_PATA_OLDPIIX is not set CONFIG_PATA_OPTIDMA=m CONFIG_PATA_OPTI=m -CONFIG_PATA_PCMCIA=m CONFIG_PATA_PDC2027X=m CONFIG_PATA_PDC_OLD=m # CONFIG_PATA_PLATFORM is not set @@ -4214,20 +4211,8 @@ CONFIG_PCI_PRI=y CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y -CONFIG_PCMCIA_3C574=m -CONFIG_PCMCIA_3C589=m -CONFIG_PCMCIA_AXNET=m -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_LOAD_CIS=y -CONFIG_PCMCIA_NMCLAN=m -CONFIG_PCMCIA_PCNET=m -# CONFIG_PCMCIA_RAYCS is not set -CONFIG_PCMCIA_SMC91C92=m -# CONFIG_PCMCIA_SPECTRUM is not set -# CONFIG_PCMCIA_WL3501 is not set -CONFIG_PCMCIA_XIRC2PS=m +# CONFIG_PCMCIA is not set CONFIG_PCMCIA_XIRCOM=m -CONFIG_PCMCIA=y CONFIG_PCNET32=m CONFIG_PCS_XPCS=m CONFIG_PD6729=m @@ -4987,7 +4972,6 @@ CONFIG_SCSI_IPR_TRACE=y # CONFIG_SCSI_IPS is not set CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_LOGGING=y -# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set CONFIG_SCSI_LOWLEVEL=y # CONFIG_SCSI_LPFC_DEBUG_FS is not set CONFIG_SCSI_LPFC=m @@ -5510,7 +5494,6 @@ CONFIG_SND_OSSEMUL=y CONFIG_SND_OXFW=m CONFIG_SND_OXYGEN=m CONFIG_SND_PCI=y -# CONFIG_SND_PCMCIA is not set CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_PCM_XRUN_DEBUG=y @@ -5855,7 +5838,6 @@ CONFIG_SSB_DRIVER_GPIO=y CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB=m CONFIG_SSB_PCIHOST=y -CONFIG_SSB_PCMCIAHOST=y CONFIG_SSB_SDIOHOST=y # CONFIG_SSFDC is not set CONFIG_STACKLEAK_METRICS=y |