diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-17 19:24:58 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-17 19:24:58 +0100 |
commit | 163b62e8bc3e36364e324a9a8caf7f13fc954ff5 (patch) | |
tree | 1585e5d54beb404114eab9587302339c79239dc1 /kernel-aarch64-rhel.config | |
parent | 8a108017f0aeb33c42f93ca67c37601522ad81ea (diff) | |
parent | ee22e4872dec1ab1f08fabe765e18b945ebcc29e (diff) | |
download | kernel-163b62e8bc3e36364e324a9a8caf7f13fc954ff5.tar.gz kernel-163b62e8bc3e36364e324a9a8caf7f13fc954ff5.tar.xz kernel-163b62e8bc3e36364e324a9a8caf7f13fc954ff5.zip |
merge originkernel-5.11.7-350.vanilla.1.fc34
Diffstat (limited to 'kernel-aarch64-rhel.config')
-rw-r--r-- | kernel-aarch64-rhel.config | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 4e04d0dbd..d434414c1 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -627,12 +627,8 @@ CONFIG_CACHEFILES=m CONFIG_CAN_8DEV_USB=m CONFIG_CAN_BCM=m CONFIG_CAN_CALC_BITTIMING=y -# CONFIG_CAN_CC770_ISA is not set -CONFIG_CAN_CC770=m -CONFIG_CAN_CC770_PLATFORM=m -CONFIG_CAN_C_CAN=m -CONFIG_CAN_C_CAN_PCI=m -CONFIG_CAN_C_CAN_PLATFORM=m +# CONFIG_CAN_CC770 is not set +# CONFIG_CAN_C_CAN is not set # CONFIG_CAN_DEBUG_DEVICES is not set CONFIG_CAN_DEV=m CONFIG_CAN_EMS_PCI=m @@ -645,31 +641,33 @@ CONFIG_CAN_ESD_USB2=m CONFIG_CAN_GW=m # CONFIG_CAN_HI311X is not set # CONFIG_CAN_IFI_CANFD is not set -# CONFIG_CAN_ISOTP is not set -# CONFIG_CAN_J1939 is not set +CONFIG_CAN_ISOTP=m +CONFIG_CAN_J1939=m # CONFIG_CAN_KVASER_PCIEFD is not set CONFIG_CAN_KVASER_PCI=m CONFIG_CAN_KVASER_USB=m -CONFIG_CAN_LEDS=y +# CONFIG_CAN_LEDS is not set CONFIG_CAN=m -# CONFIG_CAN_M_CAN is not set +CONFIG_CAN_M_CAN=m +CONFIG_CAN_M_CAN_PCI=m +# CONFIG_CAN_M_CAN_PLATFORM is not set +# CONFIG_CAN_M_CAN_TCAN4X5X is not set # CONFIG_CAN_MCBA_USB is not set -# CONFIG_CAN_MCP251XFD is not set -# CONFIG_CAN_MCP251X is not set -CONFIG_CAN_PEAK_PCIEC=y -# CONFIG_CAN_PEAK_PCIEFD is not set +CONFIG_CAN_MCP251XFD=m +# CONFIG_CAN_MCP251XFD_SANITY is not set +CONFIG_CAN_MCP251X=m +# CONFIG_CAN_PEAK_PCIEC is not set +CONFIG_CAN_PEAK_PCIEFD=m CONFIG_CAN_PEAK_PCI=m CONFIG_CAN_PEAK_USB=m CONFIG_CAN_PLX_PCI=m CONFIG_CAN_RAW=m -# CONFIG_CAN_SJA1000_ISA is not set -CONFIG_CAN_SJA1000=m -CONFIG_CAN_SJA1000_PLATFORM=m +# CONFIG_CAN_SJA1000 is not set CONFIG_CAN_SLCAN=m CONFIG_CAN_SOFTING=m # CONFIG_CAN_UCAN is not set CONFIG_CAN_VCAN=m -# CONFIG_CAN_VXCAN is not set +CONFIG_CAN_VXCAN=m # CONFIG_CAN_XILINXCAN is not set CONFIG_CAPI_AVM=y # CONFIG_CAPI_EICON is not set @@ -1706,7 +1704,7 @@ CONFIG_GACT_PROB=y # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set # CONFIG_GCC_PLUGIN_STACKLEAK is not set -CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y +# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set # CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set # CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set @@ -2234,7 +2232,7 @@ CONFIG_INFINIBAND_VMWARE_PVRDMA=m # CONFIG_INITRAMFS_COMPRESSION_NONE is not set # CONFIG_INITRAMFS_COMPRESSION_XZ is not set CONFIG_INITRAMFS_SOURCE="" -# CONFIG_INIT_STACK_NONE is not set +CONFIG_INIT_STACK_NONE=y CONFIG_INOTIFY_USER=y # CONFIG_INPUT_AD714X is not set # CONFIG_INPUT_ADXL34X is not set @@ -4521,7 +4519,8 @@ CONFIG_RTC_INTF_DEV=y CONFIG_RTC_INTF_PROC=y CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_NVMEM=y -# CONFIG_RTC_SYSTOHC is not set +CONFIG_RTC_SYSTOHC_DEVICE="rtc0" +CONFIG_RTC_SYSTOHC=y CONFIG_RT_GROUP_SCHED=y # CONFIG_RTL8180 is not set # CONFIG_RTL8187 is not set |