summaryrefslogtreecommitdiffstats
path: root/kernel-armv7hl.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2018-08-22 18:22:55 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2018-08-22 18:22:55 +0200
commit8cbcd639d6d37ee70552311b253d63709303b4a7 (patch)
tree6c0b8a449f3ea4c998926e7804d798895ff7f678 /kernel-armv7hl.config
parent3c3d1758d5bd83a411d6399273d9f241750f377c (diff)
parentf17554469f058c5d790a774d4624bf261b3edf3e (diff)
downloadkernel-4.19.0-0.rc0.git9.1.vanilla.knurd.1.fc28.tar.gz
kernel-4.19.0-0.rc0.git9.1.vanilla.knurd.1.fc28.tar.xz
kernel-4.19.0-0.rc0.git9.1.vanilla.knurd.1.fc28.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.19.0-0.rc0.git9.1.vanilla.knurd.1.fc29kernel-4.19.0-0.rc0.git9.1.vanilla.knurd.1.fc28
Diffstat (limited to 'kernel-armv7hl.config')
-rw-r--r--kernel-armv7hl.config6
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index dc8126df3..0df9fd8f4 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -913,12 +913,14 @@ CONFIG_CGROUP_PIDS=y
# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUPS=y
+# CONFIG_CHARGER_ADP5061 is not set
CONFIG_CHARGER_AXP20X=m
CONFIG_CHARGER_BQ2415X=m
CONFIG_CHARGER_BQ24190=m
# CONFIG_CHARGER_BQ24257 is not set
CONFIG_CHARGER_BQ24735=m
# CONFIG_CHARGER_BQ25890 is not set
+CONFIG_CHARGER_CROS_USBPD=m
# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
CONFIG_CHARGER_GPIO=m
CONFIG_CHARGER_ISP1704=m
@@ -2347,6 +2349,7 @@ CONFIG_I2C_DIOLAN_U2C=m
# CONFIG_I2C_EG20T is not set
# CONFIG_I2C_EMEV2 is not set
CONFIG_I2C_EXYNOS5=m
+# CONFIG_I2C_FSI is not set
# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
CONFIG_I2C_GPIO=m
CONFIG_I2C_HELPER_AUTO=y
@@ -2377,6 +2380,7 @@ CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
CONFIG_I2C_PXA=m
# CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_QCOM_GENI is not set
CONFIG_I2C_QUP=m
CONFIG_I2C_RK3X=y
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
@@ -4471,6 +4475,7 @@ CONFIG_ORION_WATCHDOG=m
CONFIG_OSF_PARTITION=y
# CONFIG_OVERLAY_FS_INDEX is not set
CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_METACOPY is not set
CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
# CONFIG_OVERLAY_FS_XINO_AUTO is not set
@@ -4771,6 +4776,7 @@ CONFIG_POWER_RESET_GPIO_RESTART=y
CONFIG_POWER_RESET_GPIO=y
# CONFIG_POWER_RESET_LTC2952 is not set
CONFIG_POWER_RESET_MSM=y
+# CONFIG_POWER_RESET_QCOM_PON is not set
# CONFIG_POWER_RESET_QNAP is not set
CONFIG_POWER_RESET_RESTART=y
CONFIG_POWER_RESET_ST=y