[2170957] Upstream stable patch causes build failure when CONFIG_SENSORS_RASPBERRYPI_HWMON is enabled

https://bugs.launchpad.net/bugs/2170957