renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 10:44:14 +08:00
Code

hwmon: (scpi) add thermal-of dependency

Browse Source 
The newly added scpi thermal support is broken when the scpi driver
is built-in but the thermal driver is a loadable module:

drivers/built-in.o: In function `scpi_hwmon_probe':
(.text+0x444d70): undefined reference to `thermal_zone_of_sensor_unregister'
(.text+0x444d94): undefined reference to `thermal_zone_of_sensor_register'
drivers/built-in.o: In function `scpi_hwmon_remove':
(text+0x444e6c): undefined reference to `thermal_zone_of_sensor_unregister'

This uses the same Kconfig trick that we have in a couple of other
drivers already to ensure we can only select the driver in valid
configurations when either THERMAL_OF is disabled, or when with a
dependency on CONFIG_THERMAL that can force SCPI to be a loadable
module in the case I was hitting.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 68acc77a2d ("hwmon: Support thermal zones registration for SCP temperature sensors")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Arnd Bergmann 2015-11-16 17:56:39 +01:00 committed by Guenter Roeck
parent 5e0a0ee4d3
commit d42d5b6f72
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/hwmon/Kconfig
View File

@ -324,6 +324,7 @@ config SENSORS_APPLESMC
config SENSORS_ARM_SCPI config SENSORS_ARM_SCPI
tristate "ARM SCPI Sensors" tristate "ARM SCPI Sensors"
depends on ARM_SCPI_PROTOCOL depends on ARM_SCPI_PROTOCOL
depends on THERMAL || !THERMAL_OF
help help
This driver provides support for temperature, voltage, current This driver provides support for temperature, voltage, current
and power sensors available on ARM Ltd's SCP based platforms. The and power sensors available on ARM Ltd's SCP based platforms. The