Merge branch 'master' of github.com:project-openwrt/openwrt

This commit is contained in:
CN_SZTL 2020-04-10 01:00:47 +08:00
commit 3f5051d341
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
3 changed files with 12 additions and 0 deletions

View File

@ -3239,6 +3239,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
# CONFIG_MTD_ROM is not set
CONFIG_MTD_ROOTFS_ROOT_DEV=y
# CONFIG_MTD_SBC_GXX is not set
# CONFIG_MTD_SLRAM is not set
# CONFIG_MTD_SM_COMMON is not set
# CONFIG_MTD_SPINAND_MT29F is not set

View File

@ -0,0 +1,11 @@
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -4,7 +4,7 @@
#
menuconfig THERMAL
- tristate "Generic Thermal sysfs driver"
+ bool "Generic Thermal sysfs driver"
help
Generic Thermal Sysfs driver offers a generic mechanism for
thermal management. Usually it's made up of one or more thermal