Commit 6df24c3e authored May 07, 2019 by Zhang Rui

Merge branches 'thermal-core', 'thermal-built-it' and 'thermal-intel' into next

parents ff54bbd1 980d43f2 44c0c237

arch/arm/configs/mini2440_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -152,7 +152,7 @@ CONFIG_SPI_S3C24XX=y
		CONFIG_SPI_SPIDEV=y
		CONFIG_GPIO_SYSFS=y
		CONFIG_SENSORS_LM75=y
		CONFIG_THERMAL=m
		CONFIG_THERMAL=y
		CONFIG_WATCHDOG=y
		CONFIG_S3C2410_WATCHDOG=y
		CONFIG_FB=y

arch/arm/configs/pxa_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -387,7 +387,7 @@ CONFIG_SENSORS_LM75=m
		CONFIG_SENSORS_LM90=m
		CONFIG_SENSORS_LM95245=m
		CONFIG_SENSORS_NTC_THERMISTOR=m
		CONFIG_THERMAL=m
		CONFIG_THERMAL=y
		CONFIG_WATCHDOG=y
		CONFIG_XILINX_WATCHDOG=m
		CONFIG_SA1100_WATCHDOG=m

arch/mips/configs/ip22_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -228,7 +228,7 @@ CONFIG_SERIAL_IP22_ZILOG=m
		# CONFIG_HW_RANDOM is not set
		CONFIG_RAW_DRIVER=m
		# CONFIG_HWMON is not set
		CONFIG_THERMAL=m
		CONFIG_THERMAL=y
		CONFIG_WATCHDOG=y
		CONFIG_INDYDOG=m
		# CONFIG_VGA_CONSOLE is not set

arch/mips/configs/ip27_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -271,7 +271,7 @@ CONFIG_I2C_PARPORT_LIGHT=m
		CONFIG_I2C_TAOS_EVM=m
		CONFIG_I2C_STUB=m
		# CONFIG_HWMON is not set
		CONFIG_THERMAL=m
		CONFIG_THERMAL=y
		CONFIG_MFD_PCF50633=m
		CONFIG_PCF50633_ADC=m
		CONFIG_PCF50633_GPIO=m

arch/unicore32/configs/unicore32_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -119,7 +119,7 @@ CONFIG_I2C_PUV3=y
		# Hardware Monitoring support
		#CONFIG_SENSORS_LM75=m
		# Generic Thermal sysfs driver
		#CONFIG_THERMAL=m
		#CONFIG_THERMAL=y
		#CONFIG_THERMAL_HWMON=y

		# Multimedia support