diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-08-22 18:22:55 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-08-22 18:22:55 +0200 |
commit | 8cbcd639d6d37ee70552311b253d63709303b4a7 (patch) | |
tree | 6c0b8a449f3ea4c998926e7804d798895ff7f678 /kernel-armv7hl-lpae-debug.config | |
parent | 3c3d1758d5bd83a411d6399273d9f241750f377c (diff) | |
parent | f17554469f058c5d790a774d4624bf261b3edf3e (diff) | |
download | kernel-8cbcd639d6d37ee70552311b253d63709303b4a7.tar.gz kernel-8cbcd639d6d37ee70552311b253d63709303b4a7.tar.xz kernel-8cbcd639d6d37ee70552311b253d63709303b4a7.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-lpae-debug.config')
-rw-r--r-- | kernel-armv7hl-lpae-debug.config | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 5146e1d21..71337119d 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -888,12 +888,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 is not set @@ -2254,6 +2256,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 @@ -2281,6 +2284,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_RK3X=y # CONFIG_I2C_ROBOTFUZZ_OSIF is not set CONFIG_I2C_S3C2410=m @@ -4274,6 +4278,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 @@ -4550,6 +4555,7 @@ CONFIG_POWER_RESET_GPIO_RESTART=y CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_RESET_KEYSTONE=y # CONFIG_POWER_RESET_LTC2952 is not set +# CONFIG_POWER_RESET_QCOM_PON is not set # CONFIG_POWER_RESET_QNAP is not set CONFIG_POWER_RESET_RESTART=y CONFIG_POWER_RESET_SYSCON_POWEROFF=y |