linux-next: build failure after merge of the thermal tree

[Stephen Rothwell]

Hi Zhang,

After merging the thermal tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/thermal/thermal_core.c:1183:1: error: redefinition of 'thermal_cooling_device_register'
 thermal_cooling_device_register(char *type, void *devdata,
 ^
In file included from drivers/thermal/thermal_core.c:34:0:
include/linux/thermal.h:345:46: note: previous definition of 'thermal_cooling_device_register' was here
 static inline struct thermal_cooling_device *thermal_cooling_device_register(
                                              ^
drivers/thermal/thermal_core.c:1221:6: error: redefinition of 'thermal_cooling_device_unregister'
 void thermal_cooling_device_unregister(struct thermal_cooling_device *cdev)
      ^
In file included from drivers/thermal/thermal_core.c:34:0:
include/linux/thermal.h:351:20: note: previous definition of 'thermal_cooling_device_unregister' was here
 static inline void thermal_cooling_device_unregister(struct thermal_cooling_device *cdev)
                    ^

Caused by commit 571ed5a8177a ("Thermal: int340x thermal: fix a Kconfig
dependency error").

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: signature.asc
Description: PGP signature