29b19e2504
Conflicts: drivers/staging/omap-thermal/omap-thermal-common. OMAP supplied dummy TC1 and TC2, at the same time that the thermal tree removed them from thermal_zone_device_register() drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c propogate the upstream MAX_IDR_LEVEL re-name to prevent a build failure Previously-fixed-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Len Brown <len.brown@intel.com> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| TODO | ||
| omap-bandgap.c | ||
| omap-bandgap.h | ||
| omap-thermal-common.c | ||
| omap-thermal.h | ||
| omap4-thermal.c | ||
| omap5-thermal.c | ||
| omap_bandgap.txt | ||