Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...

[sfrench/cifs-2.6.git] / drivers / thermal / broadcom / bcm2835_thermal.c

diff --git a/drivers/thermal/broadcom/bcm2835_thermal.c b/drivers/thermal/broadcom/bcm2835_thermal.c
index b9d90f0ed504dc20357da58104eaf63526f73e06..720760cd493feb4583bffde64edd5253dd35e380 100644 (file)
--- a/drivers/thermal/broadcom/bcm2835_thermal.c
+++ b/drivers/thermal/broadcom/bcm2835_thermal.c
@@ -18,6 +18,8 @@
 #include <linux/platform_device.h>
 #include <linux/thermal.h>
 
+#include "../thermal_hwmon.h"
+
 #define BCM2835_TS_TSENSCTL                    0x00
 #define BCM2835_TS_TSENSSTAT                   0x04
 
@@ -266,6 +268,15 @@ static int bcm2835_thermal_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, tz);
 
+       /*
+        * Thermal_zone doesn't enable hwmon as default,
+        * enable it here
+        */
+       tz->tzp->no_hwmon = false;
+       err = thermal_add_hwmon_sysfs(tz);
+       if (err)
+               goto err_tz;
+
        bcm2835_thermal_debugfs(pdev);
 
        return 0;