diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-04-14 08:58:59 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-04-14 08:58:59 +0200 |
commit | 679ee0b538c45ba7dd597367d841721407f81e30 (patch) | |
tree | 232d5524aac7a336a2fcf4e795480c6e69a7a686 /kernel-aarch64-fedora.config | |
parent | d194c69a7fd358c9e1ccf5e7a9ea28e2a8152389 (diff) | |
parent | ffff3d67a9c87edf9dc5269bde37948607f1f5b0 (diff) | |
download | kernel-679ee0b538c45ba7dd597367d841721407f81e30.tar.gz kernel-679ee0b538c45ba7dd597367d841721407f81e30.tar.xz kernel-679ee0b538c45ba7dd597367d841721407f81e30.zip |
Merge remote-tracking branch 'origin/f33' into f33-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-aarch64-fedora.config')
-rw-r--r-- | kernel-aarch64-fedora.config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index b2d4de500..05cd22a1a 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -984,7 +984,7 @@ CONFIG_CHARGER_BQ2515X=m CONFIG_CHARGER_BQ25980=m CONFIG_CHARGER_CROS_USBPD=m # CONFIG_CHARGER_DETECTOR_MAX14656 is not set -# CONFIG_CHARGER_GPIO is not set +CONFIG_CHARGER_GPIO=m # CONFIG_CHARGER_ISP1704 is not set # CONFIG_CHARGER_LP8727 is not set CONFIG_CHARGER_LT3651=m @@ -4694,6 +4694,7 @@ CONFIG_NUMA_BALANCING=y CONFIG_NUMA=y CONFIG_NVDIMM_DAX=y CONFIG_NVDIMM_PFN=y +CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y CONFIG_NVME_FC=m CONFIG_NVME_HWMON=y # CONFIG_NVMEM_IMX_IIM is not set |