summaryrefslogtreecommitdiffstats
path: root/kernel-aarch64-debug-fedora.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-04-14 08:58:51 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-04-14 08:58:51 +0200
commitf479c62ad9ab5bc5b86e48ca8ff625fb38e06b66 (patch)
tree3817c75e1b870acde7a5d65e0ddd06696a30de26 /kernel-aarch64-debug-fedora.config
parent5357150d868cc8f94cee8137b6b2fd7c19fc2217 (diff)
parent3645d92cd5645392208a78222ec95946dac58bbd (diff)
downloadkernel-f479c62ad9ab5bc5b86e48ca8ff625fb38e06b66.tar.gz
kernel-f479c62ad9ab5bc5b86e48ca8ff625fb38e06b66.tar.xz
kernel-f479c62ad9ab5bc5b86e48ca8ff625fb38e06b66.zip
Merge remote-tracking branch 'origin/f34' into f34-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