summaryrefslogtreecommitdiffstats
path: root/kernel-aarch64-debug-fedora.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-04-14 08:59:16 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-04-14 08:59:16 +0200
commit2c0f830f15feee6f31da151b6aa4c8bd04a159bb (patch)
treee21b3b5f3ebf8c486a703bb23166960555bf1ca8 /kernel-aarch64-debug-fedora.config
parente4072d9fad6584d56965be8d87aa6f46ebc6ffc1 (diff)
parent07ac2f7255fd73df601ea0080d56b2bc4da84512 (diff)
downloadkernel-2c0f830f15feee6f31da151b6aa4c8bd04a159bb.tar.gz
kernel-2c0f830f15feee6f31da151b6aa4c8bd04a159bb.tar.xz
kernel-2c0f830f15feee6f31da151b6aa4c8bd04a159bb.zip
Merge remote-tracking branch 'origin/f32' into f32-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-aarch64-debug-fedora.config')
-rw-r--r--kernel-aarch64-debug-fedora.config3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 8beb9b656..b383adfcd 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-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
@@ -4717,6 +4717,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