diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-11-08 17:55:03 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-11-08 17:55:03 +0100 |
| commit | c5b7532954817ccde60928aff205f04b98bf2148 (patch) | |
| tree | aa75f4f095ec1a0f5dad8d082bbfa5426d0fa750 /kernel-s390x-fedora.config | |
| parent | 29049005f49240a8dda098721a25009cc9120edc (diff) | |
| parent | f65857b2c3687492de171a839331b026acfda164 (diff) | |
| download | kernel-c5b7532954817ccde60928aff205f04b98bf2148.tar.gz kernel-c5b7532954817ccde60928aff205f04b98bf2148.tar.xz kernel-c5b7532954817ccde60928aff205f04b98bf2148.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-0.rc0.20211108git6b75d88fa81b.7.vanilla.1.fc36kernel-5.16.0-0.rc0.20211108git6b75d88fa81b.7.vanilla.1.fc35kernel-5.16.0-0.rc0.20211108git6b75d88fa81b.7.vanilla.1.fc34kernel-5.16.0-0.rc0.20211108git6b75d88fa81b.7.vanilla.1.fc33
Diffstat (limited to 'kernel-s390x-fedora.config')
| -rw-r--r-- | kernel-s390x-fedora.config | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 07ef5e57f..9b6385a04 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -907,7 +907,8 @@ CONFIG_CMM=m CONFIG_CNIC=m CONFIG_CODA_FS=m # CONFIG_COMEDI is not set -# CONFIG_COMMON_CLK_AXG_AUDIO is not set +CONFIG_COMMAND_LINE_SIZE=4096 +CONFIG_COMMON_CLK_AXG_AUDIO=y CONFIG_COMMON_CLK_AXI_CLKGEN=m # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set @@ -2070,6 +2071,7 @@ CONFIG_HID_MCP2221=m CONFIG_HID_MICROSOFT=m CONFIG_HID_MONTEREY=m CONFIG_HID_MULTITOUCH=m +# CONFIG_HID_NINTENDO is not set CONFIG_HID_NTI=m CONFIG_HID_NTRIG=y CONFIG_HID_ORTEK=m @@ -2124,6 +2126,7 @@ CONFIG_HID_VIVALDI=m CONFIG_HID_WACOM=m CONFIG_HID_WALTOP=m CONFIG_HID_WIIMOTE=m +# CONFIG_HID_XIAOMI is not set CONFIG_HID_XINMO=m CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m @@ -4482,6 +4485,7 @@ CONFIG_PINCTRL_MESON=y # CONFIG_PINCTRL_MSM8976 is not set # CONFIG_PINCTRL_MSM is not set # CONFIG_PINCTRL_OCELOT is not set +# CONFIG_PINCTRL_QCM2290 is not set # CONFIG_PINCTRL_QCS404 is not set CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SC7180 is not set @@ -4489,6 +4493,7 @@ CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SC8180X is not set # CONFIG_PINCTRL_SDM660 is not set # CONFIG_PINCTRL_SDX55 is not set +# CONFIG_PINCTRL_SM6350 is not set # CONFIG_PINCTRL_SM8150 is not set # CONFIG_PINCTRL_SM8250 is not set # CONFIG_PINCTRL_SM8350 is not set @@ -5072,6 +5077,7 @@ CONFIG_S390_AP_IOMMU=y CONFIG_S390_CCW_IOMMU=y CONFIG_S390_GUEST=y CONFIG_S390_HYPFS_FS=y +# CONFIG_S390_KPROBES_SANITY_TEST is not set CONFIG_S390_PRNG=m # CONFIG_S390_PTDUMP is not set CONFIG_S390_TAPE_34XX=m @@ -5234,6 +5240,7 @@ CONFIG_SCSI_UFS_CDNS_PLATFORM=m # CONFIG_SCSI_UFS_FAULT_INJECTION is not set # CONFIG_SCSI_UFSHCD is not set CONFIG_SCSI_UFS_HPB=y +# CONFIG_SCSI_UFS_HWMON is not set CONFIG_SCSI_VIRTIO=m # CONFIG_SCSI_WD719X is not set CONFIG_SCSI=y |