diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-04-18 15:25:26 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-04-18 15:25:26 +0200 |
| commit | 95325f68cbc232e30137829afdbe69770f410ec2 (patch) | |
| tree | 151d96ebb7aae0973b1d1d3b6fc20690f63d2c6c /kernel-x86_64-fedora.config | |
| parent | 042dd9d9f9254e80187215011fa4d37388e2b283 (diff) | |
| parent | ca99a52fe681aef8cd9faf562832213410fb38ec (diff) | |
| download | kernel-95325f68cbc232e30137829afdbe69770f410ec2.tar.gz kernel-95325f68cbc232e30137829afdbe69770f410ec2.tar.xz kernel-95325f68cbc232e30137829afdbe69770f410ec2.zip | |
merge originkernel-5.18.0-0.rc3.27.vanilla.1.fc37kernel-5.18.0-0.rc3.27.vanilla.1.fc36kernel-5.18.0-0.rc3.27.vanilla.1.fc35kernel-5.18.0-0.rc3.27.vanilla.1.fc34
Diffstat (limited to 'kernel-x86_64-fedora.config')
| -rw-r--r-- | kernel-x86_64-fedora.config | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 82e38aadc..53d4fd59b 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -786,8 +786,7 @@ CONFIG_CAN_PEAK_USB=m CONFIG_CAN_RAW=m # CONFIG_CAN_SJA1000 is not set CONFIG_CAN_SLCAN=m -# CONFIG_CAN_SOFTING_CS is not set -CONFIG_CAN_SOFTING=m +# CONFIG_CAN_SOFTING is not set # CONFIG_CAN_UCAN is not set CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m @@ -1389,7 +1388,7 @@ CONFIG_DM_DEBUG=y CONFIG_DM_DELAY=m CONFIG_DM_DUST=m CONFIG_DM_EBS=m -# CONFIG_DM_ERA is not set +CONFIG_DM_ERA=m CONFIG_DM_FLAKEY=m CONFIG_DMIID=y CONFIG_DM_INIT=y @@ -3387,6 +3386,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MAILBOX=y # CONFIG_MANAGER_SBS is not set CONFIG_MANTIS_CORE=m +# CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_88X2222_PHY=m # CONFIG_MARVELL_CN10K_DDR_PMU is not set @@ -7062,6 +7062,7 @@ CONFIG_TULIP=m CONFIG_TULIP_MMIO=y # CONFIG_TULIP_MWI is not set # CONFIG_TULIP_NAPI is not set +# CONFIG_TUNE_Z16 is not set CONFIG_TUN=m # CONFIG_TUN_VNET_CROSS_LE is not set # CONFIG_TWL4030_CORE is not set |